From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Wed, 25 Jan 2017 10:57:28 +0000 (+0100)
Subject: .travis.yml: different tests for "master" branch
X-Git-Tag: v1.1.3^2~9^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b66ddea7e70cee2d71c09b151b13cc973bd2db6;p=thirdparty%2Fzstd.git

.travis.yml: different tests for "master" branch
---

diff --git a/.travis.yml b/.travis.yml
index ef39ae7f1..bbd775001 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -170,6 +170,6 @@ matrix:
 script:
   - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:')
   #  dev => normal tests;  other feature branches => short tests (number > 11)
-  - if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ "$TRAVIS_BRANCH" = "dev" ] || [ $JOB_NUMBER -gt 11 ]; then sh -c "$Cmd"; fi
+  - if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" = "dev" ] || [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ $JOB_NUMBER -gt 11 ]; then sh -c "$Cmd"; fi
   #  master => long tests, as this is the final step towards a Release
-  - if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then FUZZERTEST=-T10mn sh -c "$Cmd"; fi
+  - if [ "$TRAVIS_BRANCH" = "master" ]; then FUZZERTEST=-T10mn sh -c "$Cmd"; fi