diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-11 16:45:14 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-11 16:45:14 -0700 |
| commit | be47e35a975ff7c43755e8c3898512147bb37904 (patch) | |
| tree | 3c11260b6283cac201e283c859de18bbcf4005a3 /Makefile | |
| parent | c1a38b66e56de7cc1915b4b77a3b6513acbba8eb (diff) | |
| download | qtlocation-mapboxgl-be47e35a975ff7c43755e8c3898512147bb37904.tar.gz | |
[ios, osx] The return of xcpretty, part II (#4676)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -32,9 +32,9 @@ $(OSX_PROJ_PATH)/xcshareddata/xcschemes/osxtest.xcscheme: platform/osx/scripts/o cp $< $@ test-osx: $(OSX_PROJ_PATH) $(OSX_PROJ_PATH)/xcshareddata/xcschemes/osxtest.xcscheme node_modules/express - xcodebuild -project $(OSX_PROJ_PATH) -configuration $(BUILDTYPE) -target test build + set -o pipefail && xcodebuild -project $(OSX_PROJ_PATH) -configuration $(BUILDTYPE) -target test build | xcpretty build/osx-x86_64/$(BUILDTYPE)/test || ([[ $$? == 139 || $$? == 134 ]] && cat `ls -t1 ~/Library/Logs/DiagnosticReports/* | head -n1`; exit 1) - xcodebuild -project $(OSX_PROJ_PATH) -configuration $(BUILDTYPE) -scheme osxtest test + set -o pipefail && xcodebuild -project $(OSX_PROJ_PATH) -configuration $(BUILDTYPE) -scheme osxtest test | xcpretty #### iOS targets ############################################################## @@ -50,9 +50,9 @@ iproj: $(IOS_PROJ_PATH) open $(IOS_PROJ_PATH) test-ios: $(IOS_PROJ_PATH) - xcodebuild -project $(IOS_PROJ_PATH) -configuration $(BUILDTYPE) \ + set -o pipefail && xcodebuild -project $(IOS_PROJ_PATH) -configuration $(BUILDTYPE) \ -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ - -target test build + -target test build | xcpretty ios-sim start ios-sim launch build/ios-all/$(BUILDTYPE)-iphonesimulator/ios-test.app --verbose |