From: Richard Levitte <levitte@openssl.org>
Date: Wed, 12 Apr 2017 16:57:02 +0000 (+0200)
Subject: Correct travis.yml to only build extended tests when explicitely asked to
X-Git-Tag: OpenSSL_1_1_1-pre1~1773
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2da3f9687fc0efd56d1269dfda4c9ca5b388038a;p=oweals%2Fopenssl.git

Correct travis.yml to only build extended tests when explicitely asked to

The check for this was done by checking if $TRAVIS_EVENT_TYPE is
"pull_request".  The trouble is that when new data is pushed to an
already existing pull request, the event type is "push".

Better then to go with another documented variable, $TRAVIS_PULL_REQUEST,
which is "false" in non-PR builds.

Ref: https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3205)
---

diff --git a/.travis.yml b/.travis.yml
index 24214e9bee..cb08e40d42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -146,7 +146,7 @@ matrix:
 
 before_script:
     - env
-    - if [ "$TRAVIS_EVENT_TYPE" == "pull_request" -a -n "$EXTENDED_TEST" ]; then
+    - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then
           (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || exit 0;
       fi
     - if [ -n "$DESTDIR" ]; then