summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-07-12 20:38:29 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2021-07-12 20:38:29 +0000
commit6fb986a9859c5c490bd64990e4dab2b22d5927bb (patch)
tree033f311f8abf3b5b9cf2d3b8f1c1cb44767df063
parent66a486472c0cf615e9b7d36bdeb2aaa148c2dbf6 (diff)
round-robin-bisect.sh: Fix detection of xfails
Change-Id: I070d60453fc07cc48f90f490a23d5c4d1a274edd
-rwxr-xr-xround-robin-bisect.sh13
1 files changed, 10 insertions, 3 deletions
diff --git a/round-robin-bisect.sh b/round-robin-bisect.sh
index 9e29bcaf..4991254a 100755
--- a/round-robin-bisect.sh
+++ b/round-robin-bisect.sh
@@ -92,7 +92,8 @@ case "${rr[ci_project]}/${rr[ci_config]}" in
# just-created baseline vs sumfiles in base-artifacts.
fails=$(find $rel_artifacts/build-baseline \
-path "*-check_regression/fails.sum")
- xfail="gcc-compare-results/contrib/testsuite-management/flaky/${rr[ci_config]}.xfail"
+ xfail_short="contrib/testsuite-management/flaky/${rr[ci_config]}.xfail"
+ xfail="gcc-compare-results/$xfail_short"
if ! [ -f "$fails" ] || ! [ -f "$xfail" ]; then
exit
@@ -101,10 +102,16 @@ case "${rr[ci_project]}/${rr[ci_config]}" in
(
echo
echo "# From $BUILD_URL:"
- cat "$fails" | sed -e "s/^\([A-Z]\+: \)/flaky \| \1/"
+ cat "$fails" | sed -e "/^ERROR: / d" \
+ -e "s/^\([A-Z]\+: \)/flaky \| \1/"
) >> "$xfail"
- git -C gcc-compare-results add "$xfail"
+ if ! grep -q "^flaky " "$xfail"; then
+ # There were only ERRORs in fails.sum
+ exit
+ fi
+
+ git -C gcc-compare-results add "$xfail_short"
git -C gcc-compare-results commit -m "From $BUILD_URL"
git_init_linaro_local_remote gcc-compare-results baseline false
git_push gcc-compare-results baseline master