summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-08-24 13:47:52 (GMT)
committerBrad King <brad.king@kitware.com>2006-08-24 13:47:52 (GMT)
commit93163cc1f93504976f4767480fb7d203217b0757 (patch)
tree88d6be481d6be6b4324e352a81b1f47ce0a52fa7
parent1fec884bcbbcbb91a66443c6f37fc7cff8e606ae (diff)
downloadCMake-93163cc1f93504976f4767480fb7d203217b0757.zip
CMake-93163cc1f93504976f4767480fb7d203217b0757.tar.gz
CMake-93163cc1f93504976f4767480fb7d203217b0757.tar.bz2
ENH: Added code to remove any bad installations of CVS directories before running the test so that one failure does not need manual adjustment to get it to pass again.
-rw-r--r--Tests/SimpleInstall/CMakeLists.txt2
-rw-r--r--Tests/SimpleInstallS2/CMakeLists.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt
index f640ef8..b3262bb 100644
--- a/Tests/SimpleInstall/CMakeLists.txt
+++ b/Tests/SimpleInstall/CMakeLists.txt
@@ -166,6 +166,8 @@ ELSE(STAGE2)
)
# Test directory installation.
+ FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/CVS")
+ FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
INSTALL(
DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share
PATTERN "CVS" EXCLUDE
diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt
index f640ef8..b3262bb 100644
--- a/Tests/SimpleInstallS2/CMakeLists.txt
+++ b/Tests/SimpleInstallS2/CMakeLists.txt
@@ -166,6 +166,8 @@ ELSE(STAGE2)
)
# Test directory installation.
+ FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/CVS")
+ FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
INSTALL(
DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share
PATTERN "CVS" EXCLUDE