diff options
Diffstat (limited to 'internal/rosa/package/cmake')
| -rw-r--r-- | internal/rosa/package/cmake/disable-flaky-tests.patch | 26 | ||||
| -rw-r--r-- | internal/rosa/package/cmake/package.az | 60 |
2 files changed, 68 insertions, 18 deletions
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 1e6ea8b3..38d2c286 100644 --- a/internal/rosa/package/cmake/package.az +++ b/internal/rosa/package/cmake/package.az @@ -1,42 +1,66 @@ -package cmake { - description = "cross-platform, open-source build system"; - website = "https://cmake.org"; - anitya = 306; +package cmake-source { + description = "CMake source tree"; + exclude = true; - version# = "4.4.3"; - source = remoteGitHubRelease { + version# = "4.4.4"; + output = remoteGitHubRelease { suffix = "Kitware/CMake"; tag = "v"+version; name = "cmake-"+version+".tar.gz"; - checksum = "69yrNbgUPZXY0phavZEMPRgBu_6858LHzLoyHk1aeTuXf8RW5Ec37lr2OBaGZ5PY"; + checksum = "I7vJROVzty0xtoWvDQzR5JpnEl-gO-1kXd-qIO2lWgj65Hgyd4kA08mM1wk5l8z3"; compress = gzip; }; - patches = [ "disable-broken-tests-musl.patch" ]; + patches = [ + "disable-broken-tests-musl.patch", + "disable-flaky-tests.patch", + ]; +} - // test suite expects writable source tree - writable = true; +package cmake-early { + description = "minimal CMake bootstrap build"; + exclude = true; + source = cmake-source; // expected to be writable in the copy made during bootstrap + writable = true; chmod = true; exec = make { defaults = false; - configureName = "/usr/src/cmake/bootstrap"; + configureName = "/usr/src/cmake-early/bootstrap"; configure = { "prefix": "/system"; "parallel": jobsE; "--"; "-DCMAKE_USE_OPENSSL": "OFF"; - "-DCMake_TEST_NO_NETWORK": "ON"; - "-DCMake_TEST_BOOTSTRAP": "OFF"; }; - check = [ - "CTEST_OUTPUT_ON_FAILURE=1", - "CTEST_PARALLEL_LEVEL=128", - "test", - ]; + // tested in full build + check = nil; + }; + + inputs = [ kernel-headers ]; +} + +package cmake { + description = "cross-platform, open-source build system"; + website = "https://cmake.org"; + anitya = 306; + source = cmake-source; + + // test suite expects writable source tree + writable = true; + chmod = true; + + exec = cmake { + early = true; + make = true; + cache = { + "CMAKE_USE_OPENSSL": "OFF"; + "CMake_TEST_NO_NETWORK": "ON"; + "CMake_TEST_BOOTSTRAP": "OFF"; + }; }; inputs = [ kernel-headers ]; |