From c1ae9f95bff7558506dda052cfa20adabb93517e Mon Sep 17 00:00:00 2001
From: Tom Cosgrove <tom.cosgrove@arm.com>
Date: Fri, 13 Jan 2023 12:13:41 +0000
Subject: [PATCH] Have compat.sh and ssl-opt.sh not return success for > 255
 errors

Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
---
 tests/compat.sh  | 8 ++++++--
 tests/ssl-opt.sh | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/compat.sh b/tests/compat.sh
index c06694e7494..f6a51c4fbe6 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -1445,8 +1445,7 @@ done
 
 echo "------------------------------------------------------------------------"
 
-if [ $FAILED -ne 0 -o $SRVMEM -ne 0 ];
-then
+if [ $FAILED -ne 0 -o $SRVMEM -ne 0 ]; then
     printf "FAILED"
 else
     printf "PASSED"
@@ -1462,4 +1461,9 @@ PASSED=$(( $TESTS - $FAILED ))
 echo " ($PASSED / $TESTS tests ($SKIPPED skipped$MEMREPORT))"
 
 FAILED=$(( $FAILED + $SRVMEM ))
+if [ $FAILED -gt 255 ]; then
+    # Clamp at 255 as caller gets exit code & 0xFF
+    # (so 256 would be 0, or success, etc)
+    FAILED=255
+fi
 exit $FAILED
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 94c339ebb3c..5a563ab58b6 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -10576,4 +10576,9 @@ fi
 PASSES=$(( $TESTS - $FAILS ))
 echo " ($PASSES / $TESTS tests ($SKIPS skipped))"
 
+if [ $FAILS -gt 255 ]; then
+    # Clamp at 255 as caller gets exit code & 0xFF
+    # (so 256 would be 0, or success, etc)
+    FAILS=255
+fi
 exit $FAILS