From 4ddcdbed9a0a0ed140ef4a2888acbb47da4e3361 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 10 Aug 2006 09:38:52 -0400 Subject: ENH: fix failing tests --- Tests/SimpleInstall/CMakeLists.txt | 11 +++++++++-- Tests/SimpleInstallS2/CMakeLists.txt | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index eb8a97f..05808a3 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -187,11 +187,18 @@ IF(UNIX AND NOT APPLE) ENDIF(NOT file_command) EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} 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("output from file command: [${output}]") 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("output from file command: [${output}]") endif(NOT "${output}" MATCHES "script") diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index eb8a97f..05808a3 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -187,11 +187,18 @@ IF(UNIX AND NOT APPLE) ENDIF(NOT file_command) EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} 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("output from file command: [${output}]") 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("output from file command: [${output}]") endif(NOT "${output}" MATCHES "script") -- cgit v0.12