From 1623dc2183996810c00417e9bc532ce38f7c893e Mon Sep 17 00:00:00 2001 From: Sebastien Barre Date: Wed, 27 Mar 2002 13:47:05 -0500 Subject: [PATCH] ENH: add testdriver test with source file in subdir --- Source/CMakeLists.txt | 4 +++- Tests/TestDriver/CMakeLists.txt | 8 +++++++- Tests/TestDriver/{ => subdir}/test3.cxx | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) rename Tests/TestDriver/{ => subdir}/test3.cxx (77%) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 118bf2f1e9..bab332ebab 100644 --- a/Source/CMakeLists.txt +++ b/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) diff --git a/Tests/TestDriver/CMakeLists.txt b/Tests/TestDriver/CMakeLists.txt index 0b3d07f1fd..a94e8bc9be 100644 --- a/Tests/TestDriver/CMakeLists.txt +++ b/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) diff --git a/Tests/TestDriver/test3.cxx b/Tests/TestDriver/subdir/test3.cxx similarity index 77% rename from Tests/TestDriver/test3.cxx rename to Tests/TestDriver/subdir/test3.cxx index b6bcd91dcb..13cfb5e0c8 100644 --- a/Tests/TestDriver/test3.cxx +++ b/Tests/TestDriver/subdir/test3.cxx @@ -1,5 +1,5 @@ #include -int test3(int ac, char** av) +int subdir_test3(int ac, char** av) { printf("test3\n"); for(int i =0; i < ac; i++)