Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit 9ad1188

Browse files
author
Release Manager
committed
Trac #29510: spkg-check.in: Remove messages that duplicate sage-spkg's messages
`build/bin/sage-spkg` already does: {{{ echo "Running the test suite for $PKG_NAME..." }}} and {{{ if [ "$SAGE_CHECK" = "warn" ]; then error_msg "Warning: Error testing package $PKG_NAME (ignored)" "make check" else error_msg "Error testing package $PKG_NAME" "make check" exit 1 fi }}} So we remove the messages printed by individual `spkg-check.in`. URL: https://trac.sagemath.org/29510 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): John Palmieri
2 parents f00937e + 9b213a4 commit 9ad1188

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+5
-298
lines changed

‎build/bin/sage-spkg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,7 @@ if [ "$SAGE_CHECK" = "yes" -o "$SAGE_CHECK" = "warn" ]; then
10311031
fi
10321032
else
10331033
TEST_SUITE_RESULT="passed"
1034+
echo "Passed the test suite for $PKG_NAME."
10341035
fi
10351036
else
10361037
echo "Package $PKG_NAME has no test suite."

‎build/pkgs/4ti2/spkg-check.in‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,4 @@ cd src
33
# We don't have to set up any environment variables here since the
44
# Makefiles already have them from 'configure'.
55

6-
echo "Now running 4ti2's test suite..."
76
$MAKE check
8-
if [ $? -ne 0 ]; then
9-
echo >&2 "Error: The 4ti2 test suite failed."
10-
exit 1
11-
fi
12-
13-
echo "The 4ti2 test suite passed successfully."

‎build/pkgs/atlas/spkg-check.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ make_check()
2222
# make sure everything builds correctly
2323
$MAKE check
2424
if [ $? -ne 0 ]; then
25-
echo >&2 "Error: The ATLAS self-tests failed."
25+
echo >&2 "The ATLAS self-tests failed."
2626
exit 1
2727
else
2828
echo "The ATLAS self-tests successfully passed."
@@ -35,7 +35,7 @@ make_time()
3535
# collect some timings
3636
$MAKE time
3737
if [ $? -ne 0 ]; then
38-
echo >&2 "Error: The ATLAS timing data failed to be collected."
38+
echo >&2 "The ATLAS timing data failed to be collected."
3939
exit 1
4040
else
4141
echo "The ATLAS timing data was successfully collected."

‎build/pkgs/cliquer/spkg-check.in‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
cd src
22

3-
echo "Now building and running cliquer's test suite..."
43
$MAKE check
5-
if [ $? -ne 0 ]; then
6-
echo >&2 "Error: The cliquer's test suite failed."
7-
exit 1
8-
fi
9-
10-
echo "The cliquer's test suite passed successfully."

‎build/pkgs/coxeter3/spkg-check.in‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
cd src
22

33
$MAKE check
4-
if [ $? -ne 0 ]; then
5-
echo >&2 "Error running coxeter testsuite"
6-
exit 1
7-
fi

‎build/pkgs/cvxopt/spkg-check.in‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
1-
if [ -z "$SAGE_LOCAL" ]; then
2-
echo >&2 "SAGE_LOCAL undefined ... exiting"
3-
echo >&2 "Maybe run 'sage --sh'?"
4-
exit 1
5-
fi
6-
71
cd src
82

93
if ! command -v nosetests ; then
104
echo >&2 'Testing cvxopt requires the package nose to be installed'
115
exit 1
126
fi
137

14-
echo "Testing cvxopt..."
15-
168
nosetests
17-
18-
if [ $? -ne 0 ]; then
19-
echo >&2 "Error running self tests."
20-
exit 1
21-
fi
22-

‎build/pkgs/cysignals/spkg-check.in‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
if [ -z "$SAGE_LOCAL" ]; then
2-
echo >&2 "SAGE_LOCAL undefined ... exiting"
3-
echo >&2 "Maybe run 'sage --sh'?"
4-
exit 1
5-
fi
6-
71
cd src && $MAKE check-install PYTHON=sage-python23

‎build/pkgs/dot2tex/spkg-check.in‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ for file in test_*.py; do
1111
sage-python23 $file || passed=false
1212
done
1313
echo
14-
if $passed; then
15-
echo "dot2tex's test suite passed successfully."
16-
else
17-
echo >&2 "Error(s) running dot2tex's test suite."
14+
if ! $passed; then
1815
exit 1
1916
fi

‎build/pkgs/eclib/spkg-check.in‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,4 @@
33

44
cd src
55

6-
echo
7-
echo "Now running eclib's test suite..."
86
$MAKE check
9-
if [ $? -ne 0 ]; then
10-
echo >&2 "Error: eclib's test suite failed to pass."
11-
exit 1
12-
fi
13-
echo "eclib's test suite passed without errors."

‎build/pkgs/ecm/spkg-check.in‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
1-
if [ -z "$SAGE_LOCAL" ]; then
2-
echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
3-
exit 1
4-
fi
5-
61
# Note: Running the test suite should not involve (re)compilation,
72
# so we don't set CFLAGS et al. here. (Their settings are
83
# stored in the Makefiles created by 'configure' anyway.)
94

105
cd src
116

12-
echo
13-
echo "Now running GMP-ECM's test suite..."
14-
157
$MAKE check
168
# There are potential race conditions in the long check,
179
# running it serially.
1810
$MAKE -j1 longcheck
19-
20-
if [ $? -ne 0 ]; then
21-
echo >&2 "Error: GMP-ECM's test suite failed."
22-
exit 1
23-
fi
24-
25-
echo "GMP-ECM's test suite passed."

0 commit comments

Comments
 (0)