travis.yml: switch asan32 to Ubuntu 14.04

diff --git a/.travis.yml b/.travis.yml
index 21905393dada5c79ee2abeb5860512826559007a..b95ebbee2524c54589bd7d2f1be8310f8f154a5d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,9 @@ matrix:
       sudo: false
 
 
-    # Standard Ubuntu 12.04 LTS Server Edition 64 bit
-    - env: Ubu=12.04 Cmd="make asan32"
+    - env: Ubu=14.04 Cmd="make asan32"
       os: linux
+      dist: trusty
       sudo: required
       addons:
         apt:
@@ -29,6 +29,8 @@ matrix:
             - libc6-dev-i386
             - gcc-multilib
 
+
+    # Standard Ubuntu 12.04 LTS Server Edition 64 bit
     - env: Ubu=12.04 Cmd='cd contrib/pzstd && make googletest && make tsan && make check && make clean && make asan && make check && make clean && cd ../..'
       os: linux
       sudo: required
@@ -131,12 +133,13 @@ matrix:
 script:
   - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:')
 
-  #  cron & master => long tests, as this is the final step towards a Release
-  #  dev => normal tests;  other feature branches => short tests (number > 11)
+  #  cron & master          => long tests, as this is the final step towards a Release
+  #  dev                    => normal tests
+  #  other feature branches => short tests (number > 10)
   - if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
         FUZZERTEST=-T10mn sh -c "$Cmd" || travis_terminate 1;
     else
-        if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ $JOB_NUMBER -gt 11 ] || [ "$TRAVIS_BRANCH" = "dev" ]; then
+        if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ $JOB_NUMBER -gt 10 ] || [ "$TRAVIS_BRANCH" = "dev" ]; then
             sh -c "$Cmd" || travis_terminate 1;
         fi
     fi