From b99ad8278762a10abcb1cfc9a413491a9e432ee9 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 23 Jan 2021 11:27:01 -0500 Subject: [PATCH 1/4] Move alarm test from core-tests.m2 to alarm.m2 The former includes a bunch of tests originally found in Macaulay2Doc, and this puts to the two alarm-related Core tests together in the same file. --- M2/Macaulay2/tests/normal/alarm.m2 | 4 ++++ M2/Macaulay2/tests/normal/core-tests.m2 | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/M2/Macaulay2/tests/normal/alarm.m2 b/M2/Macaulay2/tests/normal/alarm.m2 index 8bfd53cba24..9fde6713c13 100644 --- a/M2/Macaulay2/tests/normal/alarm.m2 +++ b/M2/Macaulay2/tests/normal/alarm.m2 @@ -1,3 +1,7 @@ -- test that alarms work time try ( alarm(1); while true do 1 ) else true + +R = QQ[vars(0..24)] +f = () -> (alarm 4; try res coker vars R else "ran out of time") +time f() diff --git a/M2/Macaulay2/tests/normal/core-tests.m2 b/M2/Macaulay2/tests/normal/core-tests.m2 index 1fc1e099a62..b3d3d82d260 100644 --- a/M2/Macaulay2/tests/normal/core-tests.m2 +++ b/M2/Macaulay2/tests/normal/core-tests.m2 @@ -41,13 +41,6 @@ assert(Ext^1(G,omega) == dual HH^1(G)) assert(Ext^0(G,omega) == dual HH^2(G)) - - -R = QQ[vars(0..24)] -f = () -> (alarm 4; try res coker vars R else "ran out of time") -time f() - - -- fib = memoize( n -> if n <= 1 then 1 else fib(n-1) + fib(n-2) ) assert ( fib 10 == 89 ) From 7f27a79786a671862f38286daa4041410e93196f Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 23 Jan 2021 11:29:29 -0500 Subject: [PATCH 2/4] Skip alarm tests during "check Core" --- M2/Macaulay2/tests/normal/alarm.m2 | 1 + 1 file changed, 1 insertion(+) diff --git a/M2/Macaulay2/tests/normal/alarm.m2 b/M2/Macaulay2/tests/normal/alarm.m2 index 9fde6713c13..88fc29e3e58 100644 --- a/M2/Macaulay2/tests/normal/alarm.m2 +++ b/M2/Macaulay2/tests/normal/alarm.m2 @@ -1,3 +1,4 @@ +-- no-check-flag (see https://github.com/Macaulay2/M2/issues/1392) -- test that alarms work time try ( alarm(1); while true do 1 ) else true From ee2165d0ce8da5f4e867638db0bfd21ca1ced59f Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 23 Jan 2021 13:07:53 -0500 Subject: [PATCH 3/4] Restore M2 --check 2/3 in GitHub workflow --- .github/workflows/test_build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 862ff2a8ef3..77119fa1ba2 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -184,9 +184,8 @@ jobs: if: matrix.build-system == 'cmake' && matrix.os == 'ubuntu-latest' && matrix.compiler == 'clang10' run: | ./M2 -q --check 1 -e 'exit 0' - # TODO: uncomment these when https://github.com/Macaulay2/M2/issues/1849 is fixed - #./M2 -q --check 2 -e 'exit 0' - #./M2 -q --check 3 -e 'exit 0' + ./M2 -q --check 2 -e 'exit 0' + ./M2 -q --check 3 -e 'exit 0' cmake --build . --target M2-tests cmake --build . --target M2-unit-tests ctest -j1 --output-on-failure -R "unit-tests" From fdadd0f3a314cbdc1e913b4a7fc94dd8061f6a11 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 23 Jan 2021 13:44:06 -0500 Subject: [PATCH 4/4] Update factory download link in CMake build --- M2/cmake/build-libraries.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/M2/cmake/build-libraries.cmake b/M2/cmake/build-libraries.cmake index 3e0505f660b..3fa0fb9b0e1 100644 --- a/M2/cmake/build-libraries.cmake +++ b/M2/cmake/build-libraries.cmake @@ -393,7 +393,7 @@ _ADD_COMPONENT_DEPENDENCY(libraries flint "mp;mpfr;ntl" FLINT_FOUND) # https://service.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/ # TODO: what is ftmpl_inst.o? ExternalProject_Add(build-factory - URL https://service.mathematik.uni-kl.de/ftp/pub/Math/Factory/factory-4.2.0.tar.gz + URL https://faculty.math.illinois.edu/Macaulay2/Downloads/OtherSourceCode/factory-4.2.0.tar.gz URL_HASH SHA256=b66c4c78847e24b71386a42ea2fb368b721f5cb03966c8c78801f1677c45e6c0 PREFIX libraries/factory SOURCE_DIR libraries/factory/build