Преглед изворни кода

Merge topic 'exclude-ExternalProject-test-for-cygwin-release-script'

3a17311 Release: Temporarily exclude ExternalProject test on cygwin
David Cole пре 13 година
родитељ
комит
bed44c2cc1
2 измењених фајлова са 9 додато и 1 уклоњено
  1. 8 0
      Utilities/Release/dash2win64_cygwin.cmake
  2. 1 1
      Utilities/Release/release_cmake.sh.in

+ 8 - 0
Utilities/Release/dash2win64_cygwin.cmake

@@ -16,4 +16,12 @@ set(CC  gcc)
 set(SCRIPT_NAME dash2win64cygwin)
 set(GIT_EXTRA "git config core.autocrlf true")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+# WARNING: Temporary fix!! This exclusion of the ExternalProject test
+# is temporary until we can set up a new cygwin build machine.
+# It only fails because of cygwin/non-cygwin "svn" mismatches in this
+# particular environment. This is less than ideal, but at least it
+# allows us to produce cygwin builds in the short term.
+set(EXTRA_CTEST_ARGS "-E ExternalProject")
+
 include(${path}/release_cmake.cmake)

+ 1 - 1
Utilities/Release/release_cmake.sh.in

@@ -121,7 +121,7 @@ check_exit_value $? "Build cmake" || exit 1
 
 if [ -z "@SKIP_TESTS@" ]; then
     echo "Run cmake tests"
-    ./bin/ctest --output-on-failure -j @PROCESSORS@ test
+    ./bin/ctest --output-on-failure -j @PROCESSORS@ @EXTRA_CTEST_ARGS@
     check_exit_value $? "Test cmake" || exit 1
 fi