Преглед изворни кода

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
Michael Haney пре 6 година
родитељ
комит
3210d53aae
2 измењених фајлова са 15 додато и 2 уклоњено
  1. 11 0
      .travis.yml
  2. 4 2
      scripts/build.sh

+ 11 - 0
.travis.yml

@@ -140,6 +140,15 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh GoogleDataTransport.podspec
 
+    # GoogleDataTransport integration tests using the default Xcode version.
+    - stage: test
+      env:
+        - PROJECT=GoogleDataTransportIntegrationTest PLATFORM=iOS METHOD=xcodebuild
+      before_install:
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
+
     # GoogleDataTransportCCTSupport unit tests and pod linting using the default Xcode version.
     - stage: test
       env:
@@ -323,6 +332,8 @@ jobs:
       - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild SANITIZERS=tsan
     - env:
       - PROJECT=InAppMessaging PLATFORM=iOS METHOD=xcodebuild
+    - env:
+      - PROJECT=GoogleDataTransportIntegrationTest PLATFORM=iOS METHOD=xcodebuild
 
   # TODO(varconst): enable if it's possible to make this flag work on build
   # stages. It's supposed to avoid waiting for jobs that are allowed to fail

+ 4 - 2
scripts/build.sh

@@ -345,14 +345,16 @@ case "$product-$method-$platform" in
 
     RunXcodebuild \
         -workspace 'GoogleDataTransport/gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
-        -scheme "GoogleDataTransport-Unit-Tests-Integration" \
+        -scheme "GoogleDataTransport-Unit-Tests-Lifecycle" \
         "${xcb_flags[@]}" \
         build \
         test
+    ;;
 
+  GoogleDataTransportIntegrationTest-xcodebuild-iOS)
     RunXcodebuild \
         -workspace 'GoogleDataTransport/gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
-        -scheme "GoogleDataTransport-Unit-Tests-Lifecycle" \
+        -scheme "GoogleDataTransport-Unit-Tests-Integration" \
         "${xcb_flags[@]}" \
         build \
         test