kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix failing tests

This commit is contained in:
Bill Hoffman 2006-08-10 09:38:52 -04:00
parent 9419e69961
commit 4ddcdbed9a
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tests/SimpleInstall/CMakeLists.txt
View File

@ -187,11 +187,18 @@ IF(UNIX AND NOT APPLE)
ENDIF(NOT file_command) ENDIF(NOT file_command)
EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
OUTPUT_VARIABLE output) OUTPUT_VARIABLE output)
if(NOT "${output}" MATCHES "script") set(SKIP_TZ FALSE)
if("${output}" MATCHES "script")
set(SKIP_TZ TRUE)
endif("${output}" MATCHES "script")
if("${output}" MATCHES "dummy.sh")
set(SKIP_TZ TRUE)
endif("${output}" MATCHES "dummy.sh")
if(NOT SKIP_TZ)
message("compress found and it was not a script") message("compress found and it was not a script")
message("output from file command: [${output}]") message("output from file command: [${output}]")
SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
else(NOT "${output}" MATCHES "script") else(NOT SKIP_TZ)
message("compress found, but it was a script so dont use it") message("compress found, but it was a script so dont use it")
message("output from file command: [${output}]") message("output from file command: [${output}]")
endif(NOT "${output}" MATCHES "script") endif(NOT "${output}" MATCHES "script")

11
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -187,11 +187,18 @@ IF(UNIX AND NOT APPLE)
ENDIF(NOT file_command) ENDIF(NOT file_command)
EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
OUTPUT_VARIABLE output) OUTPUT_VARIABLE output)
if(NOT "${output}" MATCHES "script") set(SKIP_TZ FALSE)
if("${output}" MATCHES "script")
set(SKIP_TZ TRUE)
endif("${output}" MATCHES "script")
if("${output}" MATCHES "dummy.sh")
set(SKIP_TZ TRUE)
endif("${output}" MATCHES "dummy.sh")
if(NOT SKIP_TZ)
message("compress found and it was not a script") message("compress found and it was not a script")
message("output from file command: [${output}]") message("output from file command: [${output}]")
SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
else(NOT "${output}" MATCHES "script") else(NOT SKIP_TZ)
message("compress found, but it was a script so dont use it") message("compress found, but it was a script so dont use it")
message("output from file command: [${output}]") message("output from file command: [${output}]")
endif(NOT "${output}" MATCHES "script") endif(NOT "${output}" MATCHES "script")