status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #672 from realm/karl.kuehn/xcpretty-missing-fix 

fix case where xcpretty is not installed
This commit is contained in:
Ari Lazier 2016-11-20 14:52:17 -08:00 committed by GitHub
parent b023f492b6 d5aaab1308
commit 1d48ce1246
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/test.sh
View File

@ -11,7 +11,7 @@ CONFIGURATION="${2:-"Release"}"
DESTINATION= DESTINATION=
PATH="/opt/android-sdk-linux/platform-tools:$PATH" PATH="/opt/android-sdk-linux/platform-tools:$PATH"
SRCROOT=$(cd "$(dirname "$0")/.." && pwd) SRCROOT=$(cd "$(dirname "$0")/.." && pwd)
XCPRETTY=true XCPRETTY=`which xcpretty || true`
# Start current working directory at the root of the project. # Start current working directory at the root of the project.
cd "$SRCROOT" cd "$SRCROOT"
@ -84,7 +84,7 @@ xctest() {
local dest="$(xcrun simctl list devices | grep -v unavailable | grep -m 1 -o '[0-9A-F\-]\{36\}')" local dest="$(xcrun simctl list devices | grep -v unavailable | grep -m 1 -o '[0-9A-F\-]\{36\}')"
if [ -n "$XCPRETTY" ]; then if [ -n "$XCPRETTY" ]; then
mkdir -p build mkdir -p build
xcodebuild -scheme "$1" -configuration "$CONFIGURATION" -sdk iphonesimulator -destination id="$dest" build test | tee build/build.log | xcpretty -c --no-utf --report junit --output build/reports/junit.xml || { xcodebuild -scheme "$1" -configuration "$CONFIGURATION" -sdk iphonesimulator -destination id="$dest" build test | tee build/build.log | "$XCPRETTY" -c --no-utf --report junit --output build/reports/junit.xml || {
echo "The raw xcodebuild output is available in build/build.log" echo "The raw xcodebuild output is available in build/build.log"
exit 1 exit 1
} }
@ -151,7 +151,7 @@ case "$TARGET" in
;; ;;
"react-tests-android") "react-tests-android")
[[ $CONFIGURATION == 'Debug' ]] && exit 0 [[ $CONFIGURATION == 'Debug' ]] && exit 0
XCPRETTY=false XCPRETTY=''
pushd tests/react-test-app pushd tests/react-test-app