Merge pull request #1867 from d-torrance/combine-and-skip-alarm-tests

Combine Core alarm tests and skip them during "check"
Macaulay2 · Jan 23, 2021 · 8019041 · 8019041
2 parents 559a951 + fdadd0f
commit 8019041
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git 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"

diff --git a/M2/Macaulay2/tests/normal/alarm.m2 b/M2/Macaulay2/tests/normal/alarm.m2
@@ -1,3 +1,8 @@
+-- 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
+
+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
@@ -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 )

diff --git 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