From 902a54d9d91ef9db14adcf30795f5484a755ec5b Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Tue, 13 Jul 2021 09:37:56 +0000
Subject: tcwg_gnu-build.sh, round-robin-bisect.sh: Ignore ERRORs in partial
 test runs

Change-Id: Id979f643fdda0fe25a4d94a1d49e8fdb7023d354
---
 round-robin-bisect.sh |  8 +-------
 tcwg_gnu-build.sh     | 12 ++++++++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/round-robin-bisect.sh b/round-robin-bisect.sh
index 4991254a..fddaa295 100755
--- a/round-robin-bisect.sh
+++ b/round-robin-bisect.sh
@@ -102,15 +102,9 @@ case "${rr[ci_project]}/${rr[ci_config]}" in
 	(
 	    echo
 	    echo "# From $BUILD_URL:"
-	    cat "$fails" | sed -e "/^ERROR: / d" \
-			       -e "s/^\([A-Z]\+: \)/flaky \| \1/"
+	    cat "$fails" | sed -e "s/^\([A-Z]\+: \)/flaky \| \1/"
 	) >> "$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
diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh
index 1b48ac4b..d4fff8f9 100755
--- a/tcwg_gnu-build.sh
+++ b/tcwg_gnu-build.sh
@@ -145,9 +145,17 @@ no_regression_p ()
 	xfail="$xfail/${rr[ci_config]}"
     fi
 
+    local ignore_ERRORs_opt=""
+    if [ ${#runtestflags[@]} != 0 ]; then
+	# We are running a subset of the testsuite, which might generate
+	# ERRORs in GCC testsuites that will have no tests to run --
+	# ignore these ERRORs, because they are unstable from run to run.
+	ignore_ERRORs_opt="--ignore_ERRORs"
+    fi
+
     gcc-compare-results/contrib/testsuite-management/validate_failures.py \
 	--manifest=$xfail.xfail --clean_build=$sumfiles_base \
-	--build_dir=$sumfiles_new \
+	--build_dir=$sumfiles_new $ignore_ERRORs_opt \
 	| tee $run_step_artifacts/results.compare2 &
     res=0 && wait $! || res=$?
 
@@ -168,7 +176,7 @@ no_regression_p ()
 	local res1
 	gcc-compare-results/contrib/testsuite-management/validate_failures.py \
 	    --manifest=$xfail.xfail --clean_build=$sumfiles_base \
-	    --build_dir=$sumfiles_new --verbosity=1 \
+	    --build_dir=$sumfiles_new $ignore_ERRORs_opt --verbosity=1 \
 	    > $run_step_artifacts/fails.sum &
 	res1=0 && wait $! || res1=$?
 	assert_with_msg "Result comparison should have failed" \
-- 
cgit v1.2.3