From f56b5e82bb1bfd4663cb54f49f0372565ac045b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9C=D0=B8=D1=85=D0=B0?= =?utf8?q?=D0=B9=D0=BB=D0=BE=D0=B2=D0=B8=D1=87=20=D0=A0=D1=83=D1=81=D1=8F?= =?utf8?q?=D0=B5=D0=B2/AI=20Tools=20Lab=20/SRR/Staff=20Engineer/=EC=82=BC?= =?utf8?q?=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 19 Sep 2018 13:58:56 +0300 Subject: [PATCH] Add custom target to build unit tests from only nnc (#1576) * add custom target to build all tests from only nnc * add custom target to run all tests from only nnc Signed-off-by: Roman Rusyaev --- contrib/nnc/unittests/CMakeLists.txt | 14 ++++++++++++++ contrib/nnc/unittests/core/CMakeLists.txt | 2 +- contrib/nnc/unittests/pass/CMakeLists.txt | 2 +- contrib/nnc/unittests/soft_backend/CMakeLists.txt | 2 +- contrib/nnc/unittests/support/CMakeLists.txt | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/contrib/nnc/unittests/CMakeLists.txt b/contrib/nnc/unittests/CMakeLists.txt index 59b4541..8093cbc 100644 --- a/contrib/nnc/unittests/CMakeLists.txt +++ b/contrib/nnc/unittests/CMakeLists.txt @@ -1,3 +1,17 @@ +# Dummy target to build all nnc unit tests +if(ENABLE_TEST) + add_custom_target(nnc_unit_tests) + add_custom_target(nnc_check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS nnc_unit_tests) +endif() + +# function to add nnc unit test +function(add_nnc_unit_test) + if(ENABLE_TEST) + add_nncc_test(${ARGV}) + add_dependencies(nnc_unit_tests ${ARGV0}) + endif() +endfunction() + add_subdirectory(pass) add_subdirectory(core) add_subdirectory(soft_backend) diff --git a/contrib/nnc/unittests/core/CMakeLists.txt b/contrib/nnc/unittests/core/CMakeLists.txt index 3129338..a633ed3 100644 --- a/contrib/nnc/unittests/core/CMakeLists.txt +++ b/contrib/nnc/unittests/core/CMakeLists.txt @@ -1,7 +1,7 @@ file(GLOB_RECURSE HEADERS "${NNC_CORE_DIR}/include/*.h") file(GLOB_RECURSE TESTS "*.cpp") -add_nncc_test(nnc_core_test ${TESTS}) +add_nnc_unit_test(nnc_core_test ${TESTS}) if (TARGET nnc_core_test) nncc_target_link_libraries(nnc_core_test nnc_core) endif() diff --git a/contrib/nnc/unittests/pass/CMakeLists.txt b/contrib/nnc/unittests/pass/CMakeLists.txt index 35fb5d5..d1812be 100644 --- a/contrib/nnc/unittests/pass/CMakeLists.txt +++ b/contrib/nnc/unittests/pass/CMakeLists.txt @@ -1,6 +1,6 @@ file(GLOB_RECURSE TEST_SOURCES "*.cpp") -add_nncc_test(nnc_pass_test ${TEST_SOURCES}) +add_nnc_unit_test(nnc_pass_test ${TEST_SOURCES}) if (TARGET nnc_pass_test) nncc_target_link_libraries(nnc_pass_test nnc_support nnc_core) endif() diff --git a/contrib/nnc/unittests/soft_backend/CMakeLists.txt b/contrib/nnc/unittests/soft_backend/CMakeLists.txt index 88fb674..b6a4943 100644 --- a/contrib/nnc/unittests/soft_backend/CMakeLists.txt +++ b/contrib/nnc/unittests/soft_backend/CMakeLists.txt @@ -5,7 +5,7 @@ file(GLOB_RECURSE TESTS "*.cpp") make_generated_sources("${SOFT_DEF_SOURCES}" ${CMAKE_CURRENT_BINARY_DIR} SOFT_GENERATED_SOURCES) -add_nncc_test(nnc_soft_backend_test ${TESTS} ${OPTIONS_SRC} ${SOFT_BACKEND_CPP_SOURCES} ${SOFT_GENERATED_SOURCES}) +add_nnc_unit_test(nnc_soft_backend_test ${TESTS} ${OPTIONS_SRC} ${SOFT_BACKEND_CPP_SOURCES} ${SOFT_GENERATED_SOURCES}) if (TARGET nnc_soft_backend_test) nncc_target_link_libraries(nnc_soft_backend_test nnc_support nnc_interpreter nnc_core soft_backend_common) target_include_directories(nnc_soft_backend_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${NNC_SOFT_BACKEND_DIR}) diff --git a/contrib/nnc/unittests/support/CMakeLists.txt b/contrib/nnc/unittests/support/CMakeLists.txt index 07672e0..020dcfd 100644 --- a/contrib/nnc/unittests/support/CMakeLists.txt +++ b/contrib/nnc/unittests/support/CMakeLists.txt @@ -1,4 +1,4 @@ set(CL_SOURCES ${NNC_SUPPORT_DIR}/CommandLine.cpp) set(CL_TESTS CommandLineTest.cpp) -add_nncc_test(nnc_support_commandline_test ${CL_TESTS} ${CL_SOURCES}) +add_nnc_unit_test(nnc_support_commandline_test ${CL_TESTS} ${CL_SOURCES}) -- 2.7.4