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

Commit 6140a99

Browse files
author
Matthias Koeppe
committed
Merge branch 't/29501/spkg_check_in__do_not_use_sdh_make_to_do__make_check_' into t/29341/optional-test-9.1.rc0
2 parents fe346da + c53ddc7 commit 6140a99

File tree

114 files changed

+40
-1033
lines changed

Some content is hidden

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

114 files changed

+40
-1033
lines changed

‎build/bin/sage-dist-helpers‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,11 @@ sdh_make() {
184184
}
185185

186186

187+
sdh_make_check() {
188+
echo "Checking $PKG_NAME"
189+
${MAKE:-make} check "$@" || sdh_die "Failures checking $PKG_NAME"
190+
}
191+
187192
sdh_make_install() {
188193
echo "Installing $PKG_NAME"
189194
if [ -n "$SAGE_DESTDIR" ]; then

‎build/bin/sage-spkg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,13 +1037,14 @@ if [ "$SAGE_CHECK" = "yes" -o "$SAGE_CHECK" = "warn" ]; then
10371037
if [ $? -ne 0 ]; then
10381038
TEST_SUITE_RESULT="failed"
10391039
if [ "$SAGE_CHECK" = "warn" ]; then
1040-
error_msg "Warning: Error testing package $PKG_NAME (ignored)" "make check"
1040+
error_msg "Warning: Failures testing package $PKG_NAME (ignored)" "make check"
10411041
else
10421042
error_msg "Error testing package $PKG_NAME" "make check"
10431043
exit 1
10441044
fi
10451045
else
10461046
TEST_SUITE_RESULT="passed"
1047+
echo "Passed the test suite for $PKG_NAME."
10471048
fi
10481049
else
10491050
echo "Package $PKG_NAME has no test suite."

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

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

93
# We don't have to set up any environment variables here since the
104
# Makefiles already have them from 'configure'.
115

12-
echo "Now running 4ti2's test suite..."
136
$MAKE check
14-
if [ $? -ne 0 ]; then
15-
echo >&2 "Error: The 4ti2 test suite failed."
16-
exit 1
17-
fi
18-
19-
echo "The 4ti2 test suite passed successfully."

‎build/pkgs/atlas/configuration.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,6 @@
4040
# linker_GNU?, linker_Solaris?, linker_Darwin? # ld
4141

4242

43-
######################################################################
44-
### Sanity check
45-
######################################################################
46-
47-
if 'SAGE_LOCAL' not in os.environ:
48-
print("SAGE_LOCAL undefined ... exiting")
49-
print("Maybe run 'sage -sh'?")
50-
sys.exit(1)
51-
52-
5343
######################################################################
5444
### Functions
5545
######################################################################

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
######################################################################
2-
### Sanity check
3-
######################################################################
4-
5-
if [ -z "$SAGE_LOCAL" ]; then
6-
echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
7-
echo >&2 "Maybe run 'sage -sh'?"
8-
exit 1
9-
fi
10-
111
######################################################################
122
### Skip building ATLAS on specific systems
133
######################################################################
@@ -32,7 +22,7 @@ make_check()
3222
# make sure everything builds correctly
3323
$MAKE check
3424
if [ $? -ne 0 ]; then
35-
echo >&2 "Error: The ATLAS self-tests failed."
25+
echo >&2 "The ATLAS self-tests failed."
3626
exit 1
3727
else
3828
echo "The ATLAS self-tests successfully passed."
@@ -45,7 +35,7 @@ make_time()
4535
# collect some timings
4636
$MAKE time
4737
if [ $? -ne 0 ]; then
48-
echo >&2 "Error: The ATLAS timing data failed to be collected."
38+
echo >&2 "The ATLAS timing data failed to be collected."
4939
exit 1
5040
else
5141
echo "The ATLAS timing data was successfully collected."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
cd src/_build
2-
sdh_make check
2+
sdh_make_check

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
cd src
2-
sdh_make check
2+
sdh_make_check

‎build/pkgs/boost/spkg-install.in‎

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

93
echo "Running boost bootstrap"

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

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

9-
echo "Now building and running cliquer's test suite..."
103
$MAKE check
11-
if [ $? -ne 0 ]; then
12-
echo >&2 "Error: The cliquer's test suite failed."
13-
exit 1
14-
fi
15-
16-
echo "The cliquer's test suite passed successfully."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
cd src/
2-
sdh_make check
2+
sdh_make_check

0 commit comments

Comments
 (0)