Improved errors detection in Run-Tests.sh

This commit is contained in:
Pierre-Olivier Latour 2019-01-03 15:58:06 -08:00
parent e65f0eeaf1
commit fc928d0e2b

View File

@ -1,4 +1,4 @@
#!/bin/bash -ex #!/bin/bash -exu -o pipefail
OSX_SDK="macosx" OSX_SDK="macosx"
IOS_SDK="iphonesimulator" IOS_SDK="iphonesimulator"
@ -22,16 +22,21 @@ PAYLOAD_ZIP="Tests/Payload.zip"
PAYLOAD_DIR="/tmp/GCDWebServer-Payload" PAYLOAD_DIR="/tmp/GCDWebServer-Payload"
function runTests { function runTests {
EXECUTABLE="$1"
MODE="$2"
TESTS="$3"
FILE="${4:-}"
rm -rf "$PAYLOAD_DIR" rm -rf "$PAYLOAD_DIR"
ditto -x -k "$PAYLOAD_ZIP" "$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 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" cp -f "$4" "$PAYLOAD_DIR/Payload"
pushd "$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 popd
fi 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 # Run built-in OS X tests