From 631e942f8a6b53343f95b73d2384dbb3c065fd0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 11 Apr 2019 12:55:41 +0900 Subject: [PATCH] [coco] Remove coco_add_test (#3217) This commit replaces all the occurences of coco_add_test with GTest_AddTest and removes coco_add_test. Signed-off-by: Jonghyun Park --- contrib/coco/CMakeLists.txt | 4 ---- contrib/coco/core/CMakeLists.txt | 15 +++++++-------- contrib/coco/generic/CMakeLists.txt | 15 +++++++-------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/contrib/coco/CMakeLists.txt b/contrib/coco/CMakeLists.txt index 9f6c1d6..4be53e8 100644 --- a/contrib/coco/CMakeLists.txt +++ b/contrib/coco/CMakeLists.txt @@ -1,6 +1,2 @@ -macro(coco_add_test) - add_nncc_test(${ARGV}) -endmacro(coco_add_test) - add_subdirectory(core) add_subdirectory(generic) diff --git a/contrib/coco/core/CMakeLists.txt b/contrib/coco/core/CMakeLists.txt index 06c6b5e..d096096 100644 --- a/contrib/coco/core/CMakeLists.txt +++ b/contrib/coco/core/CMakeLists.txt @@ -12,14 +12,13 @@ target_link_libraries(coco_core PRIVATE stdex) # Please refer to top-level CMakeLists.txt for details target_link_libraries(coco_core PRIVATE nncc_common) -nncc_find_package(GTest QUIET) - -if(NOT GTest_FOUND) +if(NOT ENABLE_TEST) return() -endif(NOT GTest_FOUND) +endif(NOT ENABLE_TEST) -nncc_include(OptionalTargetTools) +# Google Test is required for internal testing +nncc_find_package(GTest REQUIRED) -coco_add_test(coco_core_test ${TESTS}) -optional_target_link_libraries(coco_core_test coco_core) -optional_target_link_libraries(coco_core_test stdex) +GTest_AddTest(coco_core_test ${TESTS}) +target_link_libraries(coco_core_test coco_core) +target_link_libraries(coco_core_test stdex) diff --git a/contrib/coco/generic/CMakeLists.txt b/contrib/coco/generic/CMakeLists.txt index 46cb5c1..e02bd47 100644 --- a/contrib/coco/generic/CMakeLists.txt +++ b/contrib/coco/generic/CMakeLists.txt @@ -8,16 +8,15 @@ target_link_libraries(coco_generic PUBLIC coco_core) target_link_libraries(coco_generic PRIVATE stdex) target_link_libraries(coco_generic PRIVATE nncc_common) -nncc_find_package(GTest QUIET) - -if(NOT GTest_FOUND) +if(NOT ENABLE_TEST) return() -endif(NOT GTest_FOUND) +endif(NOT ENABLE_TEST) -nncc_include(OptionalTargetTools) +# Google Test is required for internal testing +nncc_find_package(GTest REQUIRED) -coco_add_test(coco_generic_test ${TESTS}) -optional_target_link_libraries(coco_generic_test coco_generic) +GTest_AddTest(coco_generic_test ${TESTS}) +target_link_libraries(coco_generic_test coco_generic) # stdex is a PRIVATE dependency of coco_generic, and thus is not linked to coco_generic_test # even though coco_generic_test is linked to coco_generic -optional_target_link_libraries(coco_generic_test stdex) +target_link_libraries(coco_generic_test stdex) -- 2.7.4