فهرست منبع

ENH: add testdriver test with source file in subdir

Sebastien Barre 23 سال پیش
والد
کامیت
1623dc2183
3فایلهای تغییر یافته به همراه11 افزوده شده و 3 حذف شده
  1. 3 1
      Source/CMakeLists.txt
  2. 7 1
      Tests/TestDriver/CMakeLists.txt
  3. 1 1
      Tests/TestDriver/subdir/test3.cxx

+ 3 - 1
Source/CMakeLists.txt

@@ -137,18 +137,20 @@ IF(BUILD_TESTING)
       TestDriverTest
       ${CMake_BINARY_DIR}/Tests/Wrapping/bin
       TestDriverTest test1)
+
     ADD_TEST(testdriver2 ${CMake_BINARY_DIR}/Source/cmaketest 
       ${CMake_SOURCE_DIR}/Tests/TestDriver 
       ${CMake_BINARY_DIR}/Tests/TestDriver
       TestDriverTest
       ${CMake_BINARY_DIR}/Tests/Wrapping/bin
       TestDriverTest test2)
+
     ADD_TEST(testdriver3 ${CMake_BINARY_DIR}/Source/cmaketest 
       ${CMake_SOURCE_DIR}/Tests/TestDriver 
       ${CMake_BINARY_DIR}/Tests/TestDriver
       TestDriverTest
       ${CMake_BINARY_DIR}/Tests/Wrapping/bin
-      TestDriverTest test3)
+      TestDriverTest subdir/test3)
 
   ENDIF (DART_ROOT)
 ENDIF(BUILD_TESTING)

+ 7 - 1
Tests/TestDriver/CMakeLists.txt

@@ -1,4 +1,10 @@
 PROJECT(TestDriverTest)
-CREATE_TEST_SOURCELIST(testSrcs TestDriverTest test1 test2 test3)
+
+CREATE_TEST_SOURCELIST(testSrcs 
+                       TestDriverTest 
+                       test1 
+                       test2 
+	               subdir/test3)
+
 ADD_EXECUTABLE(TestDriverTest testSrcs)
 

+ 1 - 1
Tests/TestDriver/test3.cxx → Tests/TestDriver/subdir/test3.cxx

@@ -1,5 +1,5 @@
 #include <stdio.h>
-int test3(int ac, char** av)
+int subdir_test3(int ac, char** av)
 {
   printf("test3\n");
   for(int i =0; i < ac; i++)