---

pongad · web-flow · commit d6ec14772def · 2017-06-09T14:44:12.000+10:00
yaml --- r: 8117 b: refs/heads/tswast-patch-1 c: 0e0c703 h: refs/heads/master i: 8115: eaea350
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: d43a5408537666afb1d3a144c39a18fd43c9cf71
+refs/heads/tswast-patch-1: 0e0c7039dd99eac0a7bbd8ecc3cd7f50cff1d766
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/utilities/verify.sh b/branches/tswast-patch-1/utilities/verify.sh
@@ -2,15 +2,19 @@
 # This script is used by Travis-CI to run tests.
 # This script is referenced in .travis.yml.
 
+mvn_opts="-DtrimStackTrace=false -fae --quiet -Djava.util.logging.config.file=logging.properties -P release"
+
 if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     source ./utilities/integration_test_env.sh
     # Get signing tools and API keyfile
     openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out $TRAVIS_BUILD_DIR/signing-tools.tar -d
     mkdir $TRAVIS_BUILD_DIR/signing-tools
     chmod 700 $TRAVIS_BUILD_DIR/signing-tools
     tar xvf $TRAVIS_BUILD_DIR/signing-tools.tar -C $TRAVIS_BUILD_DIR/signing-tools
-    # Run verify
-    mvn verify --quiet -Djava.util.logging.config.file=logging.properties -P release
 else
-    mvn verify --quiet -Djava.util.logging.config.file=logging.properties -DskipITs -P release
+    # Skip integration tests when testing pull requests.
+    mvn_opts+=" -DskipITs"
 fi
+
+# We don't quote expansion here, since we actually want space to separate the arguments.
+mvn verify $mvn_opts
