From 20cae05c77d8310f1d55ef4f16da43fb0057cb0f Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Thu, 23 Sep 2021 12:38:45 +0000
Subject: round-robin.sh (no_build_regression_p): Make more robust

Change-Id: Icf967c14f5c49b808c3ddeb50c31717e66f587a5
---
 round-robin.sh | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/round-robin.sh b/round-robin.sh
index 99644593..7649e692 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -555,23 +555,24 @@ no_build_regression_p ()
     build_result_ref=$(grep -v "^#" $ref_artifacts/results | tail -n1)
     build_result_new=$(grep -v "^#" $new_artifacts/results | tail -n1)
 
-    if [ $build_result_new -lt $build_result_ref ]; then
-	local last_log
-	last_log=$(find $new_artifacts/ -name console.log.xz | sort -g | tail -n1)
-	# In log scan for errors below
-	#   - sed -e 's/"[^"]*"//g' -- removes quoted "error: app diagnostics" strings
-	#   - " error:" detects compiler errors from GCC and Clang (including GCC ICEs)
-	#   - "^ERROR:" detects linker errors
-	#   - ": undefined reference" detects missing symbols during linking
-	#   - "] Error " detects GNU make errors
-	# Then grep for "grep" to exclude other uses of this search.
-	cat > $run_step_artifacts/results.regressions <<EOF
+    if [ $build_result_new -ge $build_result_ref ]; then
+	return 0
+    fi
+
+    local last_log
+    last_log=$(find $new_artifacts/ -name console.log.xz | sort -g | tail -n1)
+    # In log scan for errors below
+    #   - sed -e 's/"[^"]*"//g' -- removes quoted "error: app diagnostics" strings
+    #   - " error:" detects compiler errors from GCC and Clang (including GCC ICEs)
+    #   - "^ERROR:" detects linker errors
+    #   - ": undefined reference" detects missing symbols during linking
+    #   - "] Error " detects GNU make errors
+    # Then grep for "grep" to exclude other uses of this search.
+    cat > $run_step_artifacts/results.regressions <<EOF
 # First few build errors in logs:
 $(xzcat $last_log | sed -e 's/"[^"]*"//g' | grep " error:\|^ERROR:\|: undefined reference\|\] Error " | grep -v "grep" | head | sed -e "s/^/# /")
 EOF
-	return 1
-    fi
-    return 0
+    return 1
     )
 }
 
-- 
cgit v1.2.3