From 582ec292af89f1e7207387cf8655f4acf529a8e0 Mon Sep 17 00:00:00 2001
From: Christophe Lyon <christophe.lyon@linaro.org>
Date: Tue, 30 Jun 2020 09:00:29 +0000
Subject: tcwg_gnu-build.sh: Use results comparison scripts from
 gcc-compare-results

They are based on GCC's compare_tests but support a list of unstable
tests.

Change-Id: Icc582846d2cdd5df895cad373e3021fc7e154fbd
---
 tcwg_gnu-build.sh | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh
index 2e6f45e4..0bef14a4 100755
--- a/tcwg_gnu-build.sh
+++ b/tcwg_gnu-build.sh
@@ -119,17 +119,34 @@ no_regression_p ()
     fi
 
     local res
-    if ! echo "${rr[components]}" | tr ' ' '\n' | grep -q "^gcc\$"; then
-	# We use GCC's comparison script, so make sure we have a copy (may
-	# not be the case when we are just checking binutils)
-	clone_or_update_repo gcc master git://gcc.gnu.org/git/gcc.git
-    fi
+
+    # We use our modified version of GCC's comparison script
+    clone_or_update_repo gcc-compare-results master https://git.linaro.org/toolchain/gcc-compare-results.git
+
     # (defined by init_step in jenkins-helpers)
     # shellcheck disable=SC2154
-    gcc/contrib/compare_tests $sumfiles_base $sumfiles_new \
+    gcc-compare-results/compare_tests -compr none -pass-thresh 0.95 \
+				      $sumfiles_base $sumfiles_new \
 	| sed -e "s/^/# /" | tee $run_step_artifacts/results.regressions &
     res=0 && wait $! || res=$?
 
+    # Handle return codes in the same way as in compare_jobs.sh from
+    # gcc-compare-results
+    case $res in
+	# Regression, No common logs, extra logs or build failed
+	2|3|4|5)
+	    res=1
+	    ;;
+	# No change or improvement
+	0|1)
+	    res=0
+	    ;;
+	*)
+	    assert_with_msg "Unknown results comparison status: $res" false
+	    res=1
+	    ;;
+    esac
+
     if [ $res -ne 0 ]; then
         return 1
     fi
-- 
cgit v1.2.3