[nnc] Remove add_nncc_test from build script (#3247)

This commit removes add_nncc_test from build script as a step to remove
add_nncc_test from the top-level CMakeLists.txt.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/nnc/cmake/utils.cmake b/contrib/nnc/cmake/utils.cmake
index bd9c517..58cd65d 100644 (file)
--- a/contrib/nnc/cmake/utils.cmake
+++ b/contrib/nnc/cmake/utils.cmake
@@ -53,7 +53,11 @@ endfunction()
 
 # function to add nnc unit test
 function(nnc_add_unit_test)
-  add_nncc_test(${ARGV})
+  if(ENABLE_TEST)
+    add_executable(${ARGV})
+    target_link_libraries(${ARGV0} gtest_main)
+    add_test(${ARGV0} ${ARGV0})
+  endif(ENABLE_TEST)
   add_dependencies(nnc_unit_tests ${ARGV0})
   target_include_directories(${ARGV0} PUBLIC ${NNC_ROOT_SRC_DIR}/include ${NNC_ROOT_BIN_DIR}/include)
 endfunction()

diff --git a/contrib/nnc/tests/acl_soft_backend/CMakeLists.txt b/contrib/nnc/tests/acl_soft_backend/CMakeLists.txt
index 83eec1a..435c398 100644 (file)
--- a/contrib/nnc/tests/acl_soft_backend/CMakeLists.txt
+++ b/contrib/nnc/tests/acl_soft_backend/CMakeLists.txt
@@ -30,11 +30,12 @@ if(NOT DEFINED ENV{ODROID_H5_DIR})
 endif()
 
 find_package(HDF5 COMPONENTS CXX REQUIRED)
+nncc_find_package(GTest REQUIRED)
 
 # Provide the test suite with the information where to locate executalbes to run etc.
 configure_file(BuildInfo.h.in BuildInfo.h)
 
-add_nncc_test(nnc_acl_soft_backend_system_test AclCppOperations.cpp)
+GTest_AddTest(nnc_acl_soft_backend_system_test AclCppOperations.cpp)
 add_dependencies(nnc_acl_soft_backend_system_test tensor_gen caffegen nnkit-run)
 target_include_directories(nnc_acl_soft_backend_system_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
     ${HDF5_INCLUDE_DIRS})