From fc928d0e2bf2aaf4869ebd6ed30be373c9710a92 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Latour <pol@mac.com>
Date: Thu, 3 Jan 2019 15:58:06 -0800
Subject: [PATCH] Improved errors detection in Run-Tests.sh

---
 Run-Tests.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Run-Tests.sh b/Run-Tests.sh
index 3119d88..e2fbf98 100755
--- a/Run-Tests.sh
+++ b/Run-Tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -exu -o pipefail
 
 OSX_SDK="macosx"
 IOS_SDK="iphonesimulator"
@@ -22,16 +22,21 @@ PAYLOAD_ZIP="Tests/Payload.zip"
 PAYLOAD_DIR="/tmp/GCDWebServer-Payload"
 
 function runTests {
+  EXECUTABLE="$1"
+  MODE="$2"
+  TESTS="$3"
+  FILE="${4:-}"
+  
   rm -rf "$PAYLOAD_DIR"
   ditto -x -k "$PAYLOAD_ZIP" "$PAYLOAD_DIR"
   TZ=GMT find "$PAYLOAD_DIR" -type d -exec SetFile -d "1/1/2014 00:00:00" -m "1/1/2014 00:00:00" '{}' \;  # ZIP archives do not preserve directories dates
-  if [ "$4" != "" ]; then
+  if [ "$FILE" != "" ]; then
     cp -f "$4" "$PAYLOAD_DIR/Payload"
     pushd "$PAYLOAD_DIR/Payload"
-    TZ=GMT SetFile -d "1/1/2014 00:00:00" -m "1/1/2014 00:00:00" `basename "$4"`
+    TZ=GMT SetFile -d "1/1/2014 00:00:00" -m "1/1/2014 00:00:00" `basename "$FILE"`
     popd
   fi
-  logLevel=2 $1 -mode "$2" -root "$PAYLOAD_DIR/Payload" -tests "$3"
+  logLevel=2 $EXECUTABLE -mode "$MODE" -root "$PAYLOAD_DIR/Payload" -tests "$TESTS"
 }
 
 # Run built-in OS X tests