build/pkgs/sage_sws2rst/spkg-install: Do not call spkg-check from her…

…e any more
sagemath · Oct 11, 2023 · 07fbc3c · 07fbc3c
1 parent 3c2939a
commit 07fbc3c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/build/pkgs/sage_sws2rst/spkg-check b/build/pkgs/sage_sws2rst/spkg-check
@@ -1,2 +1,11 @@
 #! /bin/sh
-cd src && ./check.sh
+cd src
+./check.sh
+if [ $? -ne 0 ]; then
+    if [ "$SAGE_CHECK" = "warn" ]; then
+        echo >&2 "Warning: Failures testing package $PKG_NAME (ignored)" "make check"
+    else
+        echo >&2 "Error testing package $PKG_NAME" "make check"
+        exit 1
+    fi
+fi
diff --git a/build/pkgs/sage_sws2rst/spkg-install b/build/pkgs/sage_sws2rst/spkg-install
@@ -18,13 +18,3 @@ if [ "$SAGE_EDITABLE" = yes ]; then
 else
     sdh_pip_install .
 fi
-cd ..
-# For type=script packages, spkg-check is not run
-case "$SAGE_CHECK" in
-    yes)
-        ./spkg-check
-        ;;
-    warn)
-        ./spkg-check || echo >&2  "Warning: Failures testing package sage_sws2rst (ignored)"
-        ;;
-esac