瀏覽代碼

Different versions of cygwin report differet messages for cygwin

For cygwin pass the badexe test if either ***Failed or BAD_COMMAND
show up in the output of the test.
Bill Hoffman 15 年之前
父節點
當前提交
ab650f095f
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Tests/CMakeLists.txt

+ 2 - 2
Tests/CMakeLists.txt

@@ -1268,10 +1268,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestBadExe/testOutput.log"
     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestBadExe/testOutput.log"
     )
     )
   SET(CTestTestBadExe_REGEX "BAD_COMMAND")
   SET(CTestTestBadExe_REGEX "BAD_COMMAND")
-  # cygwin can not be made to produce a BAD_COMMAND error
+  # some cygwin can not be made to produce a BAD_COMMAND error
   # the best we can get from it is a failed test
   # the best we can get from it is a failed test
   IF(CYGWIN)
   IF(CYGWIN)
-    SET(CTestTestBadExe_REGEX "\\*\\*\\*Failed")
+    SET(CTestTestBadExe_REGEX "(\\*\\*\\*Failed)|BAD_COMMAND")
   ENDIF()
   ENDIF()
   SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES
   SET_TESTS_PROPERTIES(CTestTestBadExe PROPERTIES
     PASS_REGULAR_EXPRESSION "${CTestTestBadExe_REGEX}")
     PASS_REGULAR_EXPRESSION "${CTestTestBadExe_REGEX}")