diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-19 16:37:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-19 16:37:35 +0100 |
| commit | e8c161211f0c5bfac915979aebcd6a16b0bc49ab (patch) | |
| tree | 5c6bfeac90f189d4f07b82337cea932083751727 /contrib | |
| parent | f0fdff9b6da1a17d8e1c2d83347e84c5218b1b29 (diff) | |
| parent | 061a82fa2b751b42d0d8ddfcd45367c848d3ee64 (diff) | |
| download | gcc-e8c161211f0c5bfac915979aebcd6a16b0bc49ab.zip gcc-e8c161211f0c5bfac915979aebcd6a16b0bc49ab.tar.gz gcc-e8c161211f0c5bfac915979aebcd6a16b0bc49ab.tar.bz2 | |
Merge commit 'f7884f7673444b8a2c10ea0981d480f2e82dd16a^' into HEAD
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/regression/ChangeLog | 13 | ||||
| -rwxr-xr-x | contrib/regression/btest-gcc.sh | 31 |
2 files changed, 35 insertions, 9 deletions
diff --git a/contrib/regression/ChangeLog b/contrib/regression/ChangeLog index 27dccac..82abb1f 100644 --- a/contrib/regression/ChangeLog +++ b/contrib/regression/ChangeLog @@ -1,3 +1,16 @@ +2023-11-23 Hans-Peter Nilsson <hp@axis.com> + + * btest-gcc.sh (--handle-xpass-as-fail): New option. + +2023-11-23 Hans-Peter Nilsson <hp@axis.com> + + * btest-gcc.sh (Option handling): Break out shifts from each + option alternative. + +2023-11-23 Hans-Peter Nilsson <hp@axis.com> + + * btest-gcc.sh (Option handling): Handle multiple options. + 2023-02-16 Hans-Peter Nilsson <hp@axis.com> * objs-gcc.sh: Only bootstrap if source-directory contains gcc. diff --git a/contrib/regression/btest-gcc.sh b/contrib/regression/btest-gcc.sh index 1808fcc..684019f 100755 --- a/contrib/regression/btest-gcc.sh +++ b/contrib/regression/btest-gcc.sh @@ -22,20 +22,29 @@ add_passes_despite_regression=0 dashj='' +handle_xpass_as_fail=false # <options> can be # --add-passes-despite-regression: # Add new "PASSes" despite there being some regressions. # -j<n>: # Pass '-j<n>' to make. - -case "$1" in - --add-passes-despite-regression) - add_passes_despite_regression=1; shift;; - -j*) - dashj=$1; shift;; - -*) echo "Invalid option: $1"; exit 2;; -esac +# --handle-xpass-as-fail: +# Count XPASS as a FAIL (default ignored). + +while : ; do + case "$1" in + --add-passes-despite-regression) + add_passes_despite_regression=1;; + --handle-xpass-as-fail) + handle_xpass_as_fail=true;; + -j*) + dashj=$1;; + -*) echo "Invalid option: $1"; exit 2;; + *) break;; + esac + shift +done # TARGET is the target triplet. It should be the same one as used in # constructing PREFIX. Or it can be the keyword 'native', indicating @@ -199,7 +208,11 @@ done # Work out what failed for LOG in $TESTLOGS ; do L=`basename $LOG` - awk '/^FAIL: / { print "'$L'",$2; }' $LOG || exit 1 + if $handle_xpass_as_fail ; then + awk '/^(FAIL|XPASS): / { print "'$L'",$2; }' $LOG || exit 1 + else + awk '/^FAIL: / { print "'$L'",$2; }' $LOG || exit 1 + fi done | sort | uniq > $FAILED || exit 1 comm -12 $FAILED $PASSES >> $REGRESS || exit 1 NUMREGRESS=`wc -l < $REGRESS | tr -d ' '` |