split tests (#4354)

Tencent · Nov 17, 2022 · 057b5bb · 057b5bb
1 parent aed05aa
commit 057b5bb
Show file tree

Hide file tree

Showing 18 changed files with 2,585 additions and 982 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -19,7 +19,18 @@ macro(ncnn_add_layer_test class)
 
     # enable if WITH_LAYER_xxx option ON
     if(${WITH_LAYER_${name}})
-        ncnn_add_test(${name})
+        file(GLOB test_${name}_SRCS "test_${name}.cpp" "test_${name}_*.cpp" LIST_DIRECTORIES FALSE)
+
+        foreach(test_file ${test_${name}_SRCS})
+            get_filename_component(test_filename ${test_file} NAME_WE)
+            add_executable(${test_filename} ${test_file})
+            target_link_libraries(${test_filename} PRIVATE ncnn)
+
+            add_test(NAME ${test_filename} COMMAND ${CMAKE_COMMAND} -DTEST_EXECUTABLE=$<TARGET_FILE:${test_filename}> -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/run_test.cmake)
+
+            # add test to a virtual project group
+            set_property(TARGET ${test_filename} PROPERTY FOLDER "tests")
+        endforeach()
     endif()
 endmacro()
 
@@ -77,7 +88,7 @@ ncnn_add_layer_test(DeconvolutionDepthWise)
 ncnn_add_layer_test(DeconvolutionDepthWise1D)
 ncnn_add_layer_test(DeconvolutionDepthWise3D)
 ncnn_add_layer_test(DeepCopy)
-# ncnn_add_layer_test(DeformableConv2D)  too slow :(
+ncnn_add_layer_test(DeformableConv2D)
 ncnn_add_layer_test(Dequantize)
 ncnn_add_layer_test(Dropout)
 ncnn_add_layer_test(Einsum)

diff --git a/tests/test_binaryop.cpp b/tests/test_binaryop.cpp
@@ -382,7 +382,7 @@ int main()
 {
     SRAND(7767517);
 
-    for (op_type = 0; op_type < OP_TYPE_MAX; op_type++)
+    for (op_type = 0; op_type < 3; op_type++)
     {
         int ret = 0
                   || test_binaryop_1()