From 5c59342e6e19989c012877362af529b3d5d0abeb Mon Sep 17 00:00:00 2001 From: Mathew Huusko V Date: Fri, 2 Jun 2017 18:42:17 +0100 Subject: macOS (#38) * Example/Core: create macOS app/tests target * Example/Core: Core_Example/Tests -> Core_Example/Tests_iOS * Example/Core: macOS building/tests passing * Example/Database: separate iOS/macOS targets * BuildFrameworks: macOS * .travis.yml, test.sh: AllUnitTests -> AllUnitTests_iOS * test.sh: add AllUnitTests_macOS * Example/Storage: Example/Tests->_iOS * Example/Storage: macOS * test.sh: try to prevent double error 65 * test.sh: build before test * Example/Auth|Messaging: -> _iOS * Example/Auth: macOS build * Example/Auth: macOS passing * Example/Firebase: pod de/re-integrate; fix static DerivedData references; copy phase for OCMock * Example/Firebase: manually copied OCMock, Products Dir vs. Frameworks * Example/Firebase: copied OCMock, prevent header removal * Example/Storage: integration tests sdk fix * Example/Auth: macOS exclude FIRAuthAppCredentialManager; cleanup * Firebase/Core: remove nullability annotation * Firebase/Core|Database: correct TARGET_X usage for correctness and anticipation of OS_WATCH|TV branches * build.swift: style fix * Firebase/Core: FIRLogger: fix macOS intermittent va_list error --- test.sh | 68 ++++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 24 deletions(-) (limited to 'test.sh') diff --git a/test.sh b/test.sh index 975dbe3..9bb099d 100755 --- a/test.sh +++ b/test.sh @@ -13,30 +13,50 @@ set -eo pipefail -xcodebuild \ - -workspace Example/Firebase.xcworkspace \ - -scheme AllUnitTests \ - -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 7' \ - build \ - test \ - ONLY_ACTIVE_ARCH=YES \ - CODE_SIGNING_REQUIRED=NO \ - | xcpretty - -RESULT=$? +test_iOS() { + xcodebuild \ + -workspace Example/Firebase.xcworkspace \ + -scheme AllUnitTests_iOS \ + -sdk iphonesimulator \ + -destination 'platform=iOS Simulator,name=iPhone 7' \ + build \ + test \ + ONLY_ACTIVE_ARCH=YES \ + CODE_SIGNING_REQUIRED=NO \ + | xcpretty +} + +test_macOS() { + xcodebuild \ + -workspace Example/Firebase.xcworkspace \ + -scheme AllUnitTests_macOS \ + -sdk macosx \ + -destination 'platform=OS X,arch=x86_64' \ + build \ + test \ + ONLY_ACTIVE_ARCH=YES \ + CODE_SIGNING_REQUIRED=NO \ + | xcpretty +} + +test_iOS; RESULT=$? + if [ $RESULT == 65 ]; then echo "xcodebuild exited with 65, retrying" - xcodebuild \ - -workspace Example/Firebase.xcworkspace \ - -scheme AllUnitTests \ - -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 7' \ - build \ - test \ - ONLY_ACTIVE_ARCH=YES \ - CODE_SIGNING_REQUIRED=NO \ - | xcpretty -else - exit $RESULT + sleep 5 + + test_iOS; RESULT=$? fi + +if [ $RESULT != 0 ]; then exit $RESULT; fi + +test_macOS; RESULT=$? + +if [ $RESULT == 65 ]; then + echo "xcodebuild exited with 65, retrying" + sleep 5 + + test_macOS; RESULT=$? +fi + +exit $RESULT -- cgit v1.2.3