Skip to content

Commit 1b844e2

Browse files
author
Thierry Monteil
committed
#32781 : search for the correct pattern in the logs when SAGE_CHECK='warn'
1 parent 056b8d4 commit 1b844e2

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

build/bin/sage-spkg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,7 @@ if [ "$SAGE_CHECK" = "yes" -o "$SAGE_CHECK" = "warn" ]; then
773773
if [ $? -ne 0 ]; then
774774
TEST_SUITE_RESULT="failed"
775775
if [ "$SAGE_CHECK" = "warn" ]; then
776+
# The following warning message must be consistent with SAGE_ROOT/build/bin/sage-spkg (see trac:32781)
776777
error_msg "Warning: Failures testing package $PKG_NAME (ignored)" "make check"
777778
else
778779
error_msg "Error testing package $PKG_NAME" "make check"

build/make/install

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ EOF
122122

123123
elif [ "$SAGE_CHECK" = "warn" ]; then
124124
echo "SAGE_CHECK=warn, so scanning the log files. This may take a few seconds."
125-
warnings=`look_for_errors "$SAGE_LOGS/*.log" 20 "^Warning: Error testing" package`
125+
# The following warning message must be consistent with SAGE_ROOT/build/bin/sage-spkg (see trac:32781)
126+
warnings=`look_for_errors "$SAGE_LOGS/*.log" 20 "^Warning: Failures testing package" package`
126127
if [ -n "$warnings" ]; then
127128
cat >&2 <<EOF
128129
***************************************************************

0 commit comments

Comments
 (0)