Skip to content

Commit 3210d53

Browse files
authored
Attempt to move GDT's integration test to the allowed_failures section (#3000)
* Attempt to move GDT's integration test to the allowed_failures section * Fix syntax error * Make sure the GDT integration test is run * Rewrite allow_failures rule
1 parent 5355493 commit 3210d53

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,15 @@ jobs:
140140
- travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
141141
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh GoogleDataTransport.podspec
142142

143+
# GoogleDataTransport integration tests using the default Xcode version.
144+
- stage: test
145+
env:
146+
- PROJECT=GoogleDataTransportIntegrationTest PLATFORM=iOS METHOD=xcodebuild
147+
before_install:
148+
- ./scripts/if_changed.sh ./scripts/install_prereqs.sh
149+
script:
150+
- travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
151+
143152
# GoogleDataTransportCCTSupport unit tests and pod linting using the default Xcode version.
144153
- stage: test
145154
env:
@@ -323,6 +332,8 @@ jobs:
323332
- PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild SANITIZERS=tsan
324333
- env:
325334
- PROJECT=InAppMessaging PLATFORM=iOS METHOD=xcodebuild
335+
- env:
336+
- PROJECT=GoogleDataTransportIntegrationTest PLATFORM=iOS METHOD=xcodebuild
326337

327338
# TODO(varconst): enable if it's possible to make this flag work on build
328339
# stages. It's supposed to avoid waiting for jobs that are allowed to fail

scripts/build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,16 @@ case "$product-$method-$platform" in
345345

346346
RunXcodebuild \
347347
-workspace 'GoogleDataTransport/gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
348-
-scheme "GoogleDataTransport-Unit-Tests-Integration" \
348+
-scheme "GoogleDataTransport-Unit-Tests-Lifecycle" \
349349
"${xcb_flags[@]}" \
350350
build \
351351
test
352+
;;
352353

354+
GoogleDataTransportIntegrationTest-xcodebuild-iOS)
353355
RunXcodebuild \
354356
-workspace 'GoogleDataTransport/gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
355-
-scheme "GoogleDataTransport-Unit-Tests-Lifecycle" \
357+
-scheme "GoogleDataTransport-Unit-Tests-Integration" \
356358
"${xcb_flags[@]}" \
357359
build \
358360
test

0 commit comments

Comments
 (0)