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.

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

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