diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-06-07 13:57:05 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-06-07 13:57:05 (GMT) |
| commit | 6af66e8b200dfabd44aae9a0247c146313822db7 (patch) | |
| tree | a33d04534f805836f8a5d7406846f71fdf147d34 | |
| parent | 33f9780adec5a3b4f8c3a6bbf4e1d343e72f508b (diff) | |
| download | CMake-6af66e8b200dfabd44aae9a0247c146313822db7.zip CMake-6af66e8b200dfabd44aae9a0247c146313822db7.tar.gz CMake-6af66e8b200dfabd44aae9a0247c146313822db7.tar.bz2 | |
ENH: Add capability to include files to DartTestfile.txt and add example of that
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Source/kwsys/ExtraTest.cmake.in | 1 | ||||
| -rw-r--r-- | Tests/CTestTest/test.cmake.in | 3 | ||||
| -rw-r--r-- | Tests/CTestTest2/test.cmake.in | 3 |
5 files changed, 17 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 21b6e33..a76fc2a 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -131,6 +131,11 @@ void cmLocalGenerator::GenerateTestFiles() << "# The next line is critical for Dart to work" << std::endl << "# Duh :-)" << std::endl << std::endl; + const char* testIncludeFile = m_Makefile->GetProperty("TEST_INCLUDE_FILE"); + if ( testIncludeFile ) + { + fout << "INCLUDE(\"" << testIncludeFile << "\")" << std::endl; + } const std::vector<cmTest*> *tests = m_Makefile->GetTests(); std::vector<cmTest*>::const_iterator it; diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index ad49997..ae339b1 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -520,6 +520,11 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) ENDIF(EXECUTABLE_OUTPUT_PATH) IF(BUILD_TESTING) + IF(CTEST_TEST_KWSYS) + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ExtraTest.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/ExtraTest.cmake") + SET_DIRECTORY_PROPERTIES(PROPERTIES TEST_INCLUDE_FILE "${CMAKE_CURRENT_BINARY_DIR}/ExtraTest.cmake") + ENDIF(CTEST_TEST_KWSYS) ADD_TEST(kwsys-testSystemTools ${EXEC_DIR}/testSystemTools) ADD_TEST(kwsys-testProcess-1 ${EXEC_DIR}/testProcess 1) ADD_TEST(kwsys-testProcess-2 ${EXEC_DIR}/testProcess 2) diff --git a/Source/kwsys/ExtraTest.cmake.in b/Source/kwsys/ExtraTest.cmake.in new file mode 100644 index 0000000..e8c0a1c --- /dev/null +++ b/Source/kwsys/ExtraTest.cmake.in @@ -0,0 +1 @@ +MESSAGE("*** This message is generated by message inside a file that is included in DartTestfile.txt ***") diff --git a/Tests/CTestTest/test.cmake.in b/Tests/CTestTest/test.cmake.in index b77b26b..0a37489 100644 --- a/Tests/CTestTest/test.cmake.in +++ b/Tests/CTestTest/test.cmake.in @@ -48,6 +48,9 @@ MEMORYCHECK_COMMAND:STRING=@MEMORYCHECK_COMMAND@ MEMORYCHECK_SUPPRESSIONS_FILE:FILEPATH=@MEMORYCHECK_SUPPRESSIONS_FILE@ MEMORYCHECK_COMMAND_OPTIONS:STRING=@MEMORYCHECK_COMMAND_OPTIONS@ COVERAGE_COMMAND:FILEPATH=@COVERAGE_COMMAND@ + +# This one is needed for testing advanced ctest features +CTEST_TEST_KWSYS:BOOL=ON ") # if you do not want to use the default location for a diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in index 12ebefc..9003655 100644 --- a/Tests/CTestTest2/test.cmake.in +++ b/Tests/CTestTest2/test.cmake.in @@ -24,6 +24,9 @@ CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@ CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@ CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@ CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@ + +# This one is needed for testing advanced ctest features +CTEST_TEST_KWSYS:BOOL=ON ") CTEST_START(Experimental) |