summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2002-03-27 18:47:05 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2002-03-27 18:47:05 (GMT)
commit1623dc2183996810c00417e9bc532ce38f7c893e (patch)
tree8cb56f1a03cc14acdadfac4cb60c1f22cc36247f
parent6d5bef7dafc392fe5a7dba6a9ebe29f7b7383951 (diff)
downloadCMake-1623dc2183996810c00417e9bc532ce38f7c893e.zip
CMake-1623dc2183996810c00417e9bc532ce38f7c893e.tar.gz
CMake-1623dc2183996810c00417e9bc532ce38f7c893e.tar.bz2
ENH: add testdriver test with source file in subdir
-rw-r--r--Source/CMakeLists.txt4
-rw-r--r--Tests/TestDriver/CMakeLists.txt8
-rw-r--r--Tests/TestDriver/subdir/test3.cxx (renamed from Tests/TestDriver/test3.cxx)2
3 files changed, 11 insertions, 3 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 118bf2f..bab332e 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 0b3d07f..a94e8bc 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
index b6bcd91..13cfb5e 100644
--- a/Tests/TestDriver/test3.cxx
+++ b/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++)