]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
.travis.yml: different tests for "master" branch
authorPrzemyslaw Skibinski <inikep@gmail.com>
Wed, 25 Jan 2017 10:57:28 +0000 (11:57 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Wed, 25 Jan 2017 10:57:28 +0000 (11:57 +0100)
.travis.yml

index dba6ae9aa3d2ffb46134bc3c7562b02cfb7d31e1..ffe759c4a7685776dfe3b2065e7a289be1fbe90d 100644 (file)
@@ -161,6 +161,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