diff options
| -rw-r--r-- | internal/rosa/llvm_test.go | 2 | ||||
| -rw-r--r-- | internal/rosa/package/cmake/disable-flaky-tests.patch | 26 | ||||
| -rw-r--r-- | internal/rosa/package/cmake/package.az | 5 |
3 files changed, 31 insertions, 2 deletions
diff --git a/internal/rosa/llvm_test.go b/internal/rosa/llvm_test.go index 743430a5..547611f9 100644 --- a/internal/rosa/llvm_test.go +++ b/internal/rosa/llvm_test.go @@ -8,7 +8,7 @@ import ( ) func TestLLVMInputs(t *testing.T) { - const wantInputCount = 632 + const wantInputCount = 635 _, llvm := rosa.MustLoad(rosa.H("llvm")) var n int diff --git a/internal/rosa/package/cmake/disable-flaky-tests.patch b/internal/rosa/package/cmake/disable-flaky-tests.patch new file mode 100644 index 00000000..555f07d1 --- /dev/null +++ b/internal/rosa/package/cmake/disable-flaky-tests.patch @@ -0,0 +1,26 @@ +diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt +index cc310fffc5..9b2ec2a921 100644 +--- a/Tests/CMakeLists.txt ++++ b/Tests/CMakeLists.txt +@@ -3025,21 +3025,6 @@ if(BUILD_TESTING) + PASS_REGULAR_EXPRESSION "Start 2.*Start 3.*Start 1.*Start 2.*Start 3.*Start 1" + RESOURCE_LOCK "CostData") + +- configure_file( +- "${CMake_SOURCE_DIR}/Tests/CTestTestStopTime/test.cmake.in" +- "${CMake_BINARY_DIR}/Tests/CTestTestStopTime/test.cmake" +- @ONLY ESCAPE_QUOTES) +- configure_file( +- "${CMake_SOURCE_DIR}/Tests/CTestTestStopTime/GetDate.cmake" +- "${CMake_BINARY_DIR}/Tests/CTestTestStopTime/GetDate.cmake" +- COPYONLY) +- add_test(CTestTestStopTime ${CMAKE_CTEST_COMMAND} +- -S "${CMake_BINARY_DIR}/Tests/CTestTestStopTime/test.cmake" -V +- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestStopTime/testOutput.log" +- ) +- set_tests_properties(CTestTestStopTime PROPERTIES +- PASS_REGULAR_EXPRESSION "The stop time has been passed") +- + configure_file( + "${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in" + "${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake" diff --git a/internal/rosa/package/cmake/package.az b/internal/rosa/package/cmake/package.az index 2048b9c7..38d2c286 100644 --- a/internal/rosa/package/cmake/package.az +++ b/internal/rosa/package/cmake/package.az @@ -10,7 +10,10 @@ package cmake-source { checksum = "I7vJROVzty0xtoWvDQzR5JpnEl-gO-1kXd-qIO2lWgj65Hgyd4kA08mM1wk5l8z3"; compress = gzip; }; - patches = [ "disable-broken-tests-musl.patch" ]; + patches = [ + "disable-broken-tests-musl.patch", + "disable-flaky-tests.patch", + ]; } package cmake-early { |