diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 17:50:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-13 18:19:16 (GMT) |
| commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
| tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Tests/CTestTestCostSerial | |
| parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
| download | CMake-9db3116226cb99fcf54e936c833953abcde9b729.zip CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.bz2 | |
Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block. This is no longer the preferred style.
Run the following shell code:
for c in else endif endforeach endfunction endmacro endwhile; do
echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
Diffstat (limited to 'Tests/CTestTestCostSerial')
| -rw-r--r-- | Tests/CTestTestCostSerial/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CTestTestCostSerial/test.cmake.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CTestTestCostSerial/CMakeLists.txt b/Tests/CTestTestCostSerial/CMakeLists.txt index 29d2983..d3344cf 100644 --- a/Tests/CTestTestCostSerial/CMakeLists.txt +++ b/Tests/CTestTestCostSerial/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable (Sleep sleep.c) foreach (index RANGE 1 3) add_test (TestSleep${index} Sleep) -endforeach (index RANGE 1 3) +endforeach () set_tests_properties(TestSleep1 PROPERTIES COST -500) set_tests_properties(TestSleep2 PROPERTIES COST 12) diff --git a/Tests/CTestTestCostSerial/test.cmake.in b/Tests/CTestTestCostSerial/test.cmake.in index 3f0f6f8..8661767 100644 --- a/Tests/CTestTestCostSerial/test.cmake.in +++ b/Tests/CTestTestCostSerial/test.cmake.in @@ -18,7 +18,7 @@ set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP # Remove old cost data file if it exists if(EXISTS "${CTEST_BINARY_DIRECTORY}/Testing/Temporary/CTestCostData.txt") file(REMOVE "${CTEST_BINARY_DIRECTORY}/Testing/Temporary/CTestCostData.txt") -endif(EXISTS "${CTEST_BINARY_DIRECTORY}/Testing/Temporary/CTestCostData.txt") +endif() CTEST_START(Experimental) CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res) |