Browse Source

ENH: Added more install rules to increase coverage of the command.

Brad King 18 years ago
parent
commit
06472d620a
2 changed files with 30 additions and 2 deletions
  1. 15 1
      Tests/SimpleInstall/CMakeLists.txt
  2. 15 1
      Tests/SimpleInstallS2/CMakeLists.txt

+ 15 - 1
Tests/SimpleInstall/CMakeLists.txt

@@ -103,7 +103,7 @@ IF(STAGE2)
   ELSE(WIN32 AND NOT CYGWIN)
   ELSE(WIN32 AND NOT CYGWIN)
     SET(BAT)
     SET(BAT)
   ENDIF(WIN32 AND NOT CYGWIN)
   ENDIF(WIN32 AND NOT CYGWIN)
-  FOREACH(loc share share/old1 share/old2 share/old3)
+  FOREACH(loc share share/old1 share/old2 share/old3 share/alt)
     SET(CUR_SCRIPT "${CMAKE_INSTALL_PREFIX}/MyTest/${loc}/sample_script${BAT}")
     SET(CUR_SCRIPT "${CMAKE_INSTALL_PREFIX}/MyTest/${loc}/sample_script${BAT}")
     EXECUTE_PROCESS(
     EXECUTE_PROCESS(
       COMMAND ${CUR_SCRIPT}
       COMMAND ${CUR_SCRIPT}
@@ -173,10 +173,12 @@ ELSE(STAGE2)
     RUNTIME DESTINATION MyTest/bin
     RUNTIME DESTINATION MyTest/bin
     LIBRARY DESTINATION MyTest/lib
     LIBRARY DESTINATION MyTest/lib
     ARCHIVE DESTINATION MyTest/lib/static
     ARCHIVE DESTINATION MyTest/lib/static
+    OPTIONAL # for coverage...target should always exist
     )
     )
   INSTALL(FILES lib1.h DESTINATION MyTest/include/foo)
   INSTALL(FILES lib1.h DESTINATION MyTest/include/foo)
   INSTALL(FILES lib2.h
   INSTALL(FILES lib2.h
     DESTINATION MyTest/include/foo
     DESTINATION MyTest/include/foo
+    COMPONENT Development
     PERMISSIONS OWNER_READ OWNER_WRITE
     PERMISSIONS OWNER_READ OWNER_WRITE
     RENAME lib2renamed.h
     RENAME lib2renamed.h
     )
     )
@@ -207,11 +209,23 @@ ELSE(STAGE2)
   FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
   FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
   INSTALL(
   INSTALL(
     DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share
     DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share
+    FILE_PERMISSIONS OWNER_READ OWNER_WRITE
+    DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                          GROUP_READ GROUP_EXECUTE
     PATTERN "CVS" EXCLUDE
     PATTERN "CVS" EXCLUDE
     REGEX "\\.txt$" EXCLUDE
     REGEX "\\.txt$" EXCLUDE
     PATTERN "scripts/*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
     PATTERN "scripts/*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
     )
     )
 
 
+  # Alternate directory installation for coverage.
+  INSTALL(
+    DIRECTORY scripts/ DESTINATION MyTest/share/alt
+    COMPONENT Development
+    USE_SOURCE_PERMISSIONS
+    PATTERN "CVS" EXCLUDE
+    REGEX "\\.txt$" EXCLUDE
+    )
+
   # Test empty directory installation.
   # Test empty directory installation.
   INSTALL(DIRECTORY DESTINATION MyTest/share/empty)
   INSTALL(DIRECTORY DESTINATION MyTest/share/empty)
 
 

+ 15 - 1
Tests/SimpleInstallS2/CMakeLists.txt

@@ -103,7 +103,7 @@ IF(STAGE2)
   ELSE(WIN32 AND NOT CYGWIN)
   ELSE(WIN32 AND NOT CYGWIN)
     SET(BAT)
     SET(BAT)
   ENDIF(WIN32 AND NOT CYGWIN)
   ENDIF(WIN32 AND NOT CYGWIN)
-  FOREACH(loc share share/old1 share/old2 share/old3)
+  FOREACH(loc share share/old1 share/old2 share/old3 share/alt)
     SET(CUR_SCRIPT "${CMAKE_INSTALL_PREFIX}/MyTest/${loc}/sample_script${BAT}")
     SET(CUR_SCRIPT "${CMAKE_INSTALL_PREFIX}/MyTest/${loc}/sample_script${BAT}")
     EXECUTE_PROCESS(
     EXECUTE_PROCESS(
       COMMAND ${CUR_SCRIPT}
       COMMAND ${CUR_SCRIPT}
@@ -173,10 +173,12 @@ ELSE(STAGE2)
     RUNTIME DESTINATION MyTest/bin
     RUNTIME DESTINATION MyTest/bin
     LIBRARY DESTINATION MyTest/lib
     LIBRARY DESTINATION MyTest/lib
     ARCHIVE DESTINATION MyTest/lib/static
     ARCHIVE DESTINATION MyTest/lib/static
+    OPTIONAL # for coverage...target should always exist
     )
     )
   INSTALL(FILES lib1.h DESTINATION MyTest/include/foo)
   INSTALL(FILES lib1.h DESTINATION MyTest/include/foo)
   INSTALL(FILES lib2.h
   INSTALL(FILES lib2.h
     DESTINATION MyTest/include/foo
     DESTINATION MyTest/include/foo
+    COMPONENT Development
     PERMISSIONS OWNER_READ OWNER_WRITE
     PERMISSIONS OWNER_READ OWNER_WRITE
     RENAME lib2renamed.h
     RENAME lib2renamed.h
     )
     )
@@ -207,11 +209,23 @@ ELSE(STAGE2)
   FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
   FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS")
   INSTALL(
   INSTALL(
     DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share
     DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share
+    FILE_PERMISSIONS OWNER_READ OWNER_WRITE
+    DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                          GROUP_READ GROUP_EXECUTE
     PATTERN "CVS" EXCLUDE
     PATTERN "CVS" EXCLUDE
     REGEX "\\.txt$" EXCLUDE
     REGEX "\\.txt$" EXCLUDE
     PATTERN "scripts/*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
     PATTERN "scripts/*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
     )
     )
 
 
+  # Alternate directory installation for coverage.
+  INSTALL(
+    DIRECTORY scripts/ DESTINATION MyTest/share/alt
+    COMPONENT Development
+    USE_SOURCE_PERMISSIONS
+    PATTERN "CVS" EXCLUDE
+    REGEX "\\.txt$" EXCLUDE
+    )
+
   # Test empty directory installation.
   # Test empty directory installation.
   INSTALL(DIRECTORY DESTINATION MyTest/share/empty)
   INSTALL(DIRECTORY DESTINATION MyTest/share/empty)