build/pkgs/*/spkg-check.in: Do not print misleading error messages: a…

…void sdh_make
sagemath · Apr 18, 2020 · ca36a87 · ca36a87
1 parent 9b213a4
commit ca36a87
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 15 deletions.
diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers
@@ -184,6 +184,11 @@ sdh_make() {
 }
 
 
+sdh_make_check() {
+    echo "Checking $PKG_NAME"
+    ${MAKE:-make} check "$@" || sdh_die "Failures checking $PKG_NAME"
+}
+
 sdh_make_install() {
     echo "Installing $PKG_NAME"
     if [ -n "$SAGE_DESTDIR" ]; then

diff --git a/build/pkgs/awali/spkg-check.in b/build/pkgs/awali/spkg-check.in
@@ -1,2 +1,2 @@
 cd src/_build
-sdh_make check
+sdh_make_check
diff --git a/build/pkgs/barvinok/spkg-check.in b/build/pkgs/barvinok/spkg-check.in
@@ -1,2 +1,2 @@
 cd src
-sdh_make check
+sdh_make_check
diff --git a/build/pkgs/cocoalib/spkg-check.in b/build/pkgs/cocoalib/spkg-check.in
@@ -1,2 +1,2 @@
 cd src/
-sdh_make check
+sdh_make_check
diff --git a/build/pkgs/e_antic/spkg-check.in b/build/pkgs/e_antic/spkg-check.in
@@ -5,4 +5,4 @@
 ###############################################################################
 
 cd src
-sdh_make check
+sdh_make_check
diff --git a/build/pkgs/fflas_ffpack/spkg-check.in b/build/pkgs/fflas_ffpack/spkg-check.in
@@ -1,7 +1,9 @@
 cd src
-sdh_make check
+# Do not use sdh_make or sdh_make_check here because we are doing our own error
+# handling below
+${MAKE:-make} check
 
 if [ $? -ne 0 ]; then
-	cat tests/test-suite.log
-	exit 1
+        cat tests/test-suite.log
+        exit 1
 fi
diff --git a/build/pkgs/isl/spkg-check.in b/build/pkgs/isl/spkg-check.in
@@ -1,2 +1,2 @@
 cd src
-sdh_make check
+sdh_make_check
diff --git a/build/pkgs/openblas/spkg-check.in b/build/pkgs/openblas/spkg-check.in
@@ -17,18 +17,18 @@ if [ "x$SAGE_FAT_BINARY" = "xyes" ]; then
     OPENBLAS_CONFIGURE="$OPENBLAS_CONFIGURE TARGET=PRESCOTT"
 fi
 
-sdh_make tests $OPENBLAS_CONFIGURE
+${MAKE:-make} tests $OPENBLAS_CONFIGURE
 if [ $? -ne 0 ]; then
     # First make sure we already didn't set a target
     if [[ $OPENBLAS_CONFIGURE == *"TARGET"* ]]; then
-        sdh_die "Error while running the OpenBlas testsuite ... exiting"
+        sdh_die "Error while running the OpenBLAS testsuite ... exiting"
     else
         # The recommended TARGET is ATOM if CPU fails
         # See https://github.com/xianyi/OpenBLAS/issues/1204
         OPENBLAS_CONFIGURE="$OPENBLAS_CONFIGURE TARGET=ATOM"
         echo "Error while testing the OpenBLAS testsuite"
-        echo "Retrying the OpenBAS testsuit with TARGET=ATOM"
-        sdh_make tests $OPENBLAS_CONFIGURE
+        echo "Retrying the OpenBLAS testsuite with TARGET=ATOM"
+        ${MAKE:-make} tests $OPENBLAS_CONFIGURE
         if [ $? -ne 0 ]; then
             sdh_die "Error while running the OpenBLAS testsuite ... exiting"
         fi

diff --git a/build/pkgs/polylib/spkg-check.in b/build/pkgs/polylib/spkg-check.in
@@ -1,2 +1,2 @@
 cd src
-sdh_make check
+sdh_make_check
diff --git a/build/pkgs/polymake/spkg-check.in b/build/pkgs/polymake/spkg-check.in
@@ -1,2 +1,2 @@
 cd src/
-sdh_make test
+${MAKE:-make} test || sdh_die "Failures checking polymake"
diff --git a/build/pkgs/tides/spkg-check.in b/build/pkgs/tides/spkg-check.in
@@ -1,2 +1,2 @@
 cd src
-sdh_make check AM_CFLAGS="" AM_FFLAGS=""
+sdh_make_check AM_CFLAGS="" AM_FFLAGS=""