From 7d16090d1198fc67b3eca94f101f5fbde1fbada2 Mon Sep 17 00:00:00 2001
From: Matias N <matias@protobits.dev>
Date: Sat, 12 Sep 2020 16:18:19 -0300
Subject: [PATCH] Fix testbuild.sh to actually fail when using -x. Leave -x out
 for CI so that we detect all possible build errors for a job.

---
 .github/workflows/build.yml | 4 ++--
 tools/testbuild.sh          | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cac2619c8f..c61647bc88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -161,7 +161,7 @@ jobs:
             export CCACHE_DIR=`pwd`/ccache
             mkdir $CCACHE_DIR
             cd sources/testing
-            ./cibuild.sh -c -x testlist/${{matrix.boards}}.dat
+            ./cibuild.sh -c testlist/${{matrix.boards}}.dat
             ccache -s
 
   macOS:
@@ -195,5 +195,5 @@ jobs:
           export CCACHE_DIR=`pwd`/ccache
           mkdir $CCACHE_DIR
           cd sources/testing
-          ./cibuild.sh -i -c -x testlist/${{matrix.boards}}.dat
+          ./cibuild.sh -i -c testlist/${{matrix.boards}}.dat
           ccache -s
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index af04e829e3..1403d6ff33 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -161,6 +161,8 @@ function makefunc {
   if ! ${MAKE} ${MAKE_FLAGS} "${EXTRA_FLAGS}" ${JOPTION} $@ 1>/dev/null; then
     fail=1
   fi
+
+  return $fail
 }
 
 # Clean up after the last build
@@ -193,6 +195,8 @@ function distclean {
       fi
     fi
   fi
+
+  return $fail
 }
 
 # Configure for the next build
@@ -225,6 +229,8 @@ function configure {
 
     makefunc olddefconfig
   fi
+
+  return $fail
 }
 
 # Perform the next build
@@ -251,6 +257,8 @@ function build {
       fail=1
     fi
   fi
+
+  return $fail
 }
 
 # Coordinate the steps for the next build test