test refurb: removed xcpretty on travis + using yarn + e2e tests
Summary: - switched to yarn on travis (experimental) - removed xcpretty, we need more verbose logs - returned jest test for e2e Closes https://github.com/facebook/react-native/pull/10442 Differential Revision: D4043991 Pulled By: davidaurelio fbshipit-source-id: 50062f6a77a17643bf9a7ba7add8cee5b3bb26d2
This commit is contained in:
parent
0c7bc9801c
commit
0e5c0d2f2c
|
@ -10,9 +10,9 @@ install:
|
|||
# TODO npm 2 started stalling on Travis, t11852928
|
||||
- nvm install 5
|
||||
- rm -Rf "${TMPDIR}/jest_preprocess_cache"
|
||||
- npm config set spin=false
|
||||
- npm config set progress=false
|
||||
- travis_wait npm install
|
||||
- wget https://github.com/yarnpkg/yarn/releases/download/v0.16.0/yarn-0.16.0.js
|
||||
- export yarn="node $(pwd)/yarn-0.16.0.js"
|
||||
- $yarn install
|
||||
|
||||
script:
|
||||
- if [[ "$TEST_TYPE" = objc-ios ]]; then travis_retry travis_wait ./scripts/objc-test-ios.sh; fi
|
||||
|
|
|
@ -28,26 +28,12 @@ function cleanup {
|
|||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
# Support for environments without xcpretty installed
|
||||
set +e
|
||||
OUTPUT_TOOL=$(which xcpretty)
|
||||
set -e
|
||||
|
||||
# TODO: We use xcodebuild because xctool would stall when collecting info about
|
||||
# the tests before running them. Switch back when this issue with xctool has
|
||||
# been resolved.
|
||||
if [ -z "$OUTPUT_TOOL" ]; then
|
||||
xcodebuild \
|
||||
-project $XCODE_PROJECT \
|
||||
-scheme $XCODE_SCHEME \
|
||||
-sdk $XCODE_SDK \
|
||||
-destination "$XCODE_DESTINATION" \
|
||||
test
|
||||
else
|
||||
xcodebuild \
|
||||
-project $XCODE_PROJECT \
|
||||
-scheme $XCODE_SCHEME \
|
||||
-sdk $XCODE_SDK \
|
||||
-destination "$XCODE_DESTINATION" \
|
||||
test | $OUTPUT_TOOL && exit ${PIPESTATUS[0]}
|
||||
fi
|
||||
xcodebuild \
|
||||
-project $XCODE_PROJECT \
|
||||
-scheme $XCODE_SCHEME \
|
||||
-sdk $XCODE_SDK \
|
||||
-destination "$XCODE_DESTINATION" \
|
||||
build test
|
||||
|
|
Loading…
Reference in New Issue