ok, a last one - reorder stuff ;-) [skip ci]
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/.travis.yml b/.travis.yml
index cd94773..75bd216 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,21 +60,21 @@ matrix:
# We have only one program and the variable $BUILDOPTIONS
# has only the options to that program: testme.sh
- # Run always with valgrind (no sanitizer, but debug info)
- - env: COMPILE_DEBUG=1 BUILDOPTIONS='--with-cc=gcc-4.9 --with-m64 --with-valgrind'
+ # Check source code format
+ - env: BUILDOPTIONS='--format'
addons:
apt:
packages:
- - gcc-4.9
+ - astyle
- # Check source code format
- - env: BUILDOPTIONS='--format'
+ # Run always with valgrind (no sanitizer, but debug info)
+ - env: COMPILE_DEBUG=1 BUILDOPTIONS='--with-cc=gcc-4.9 --with-m64 --with-valgrind'
addons:
apt:
packages:
- - astyle
+ - gcc-4.9
- # GCC for the 32-bit architecture (no valgrind yet)
+ # GCC for the 32-bit architecture (no valgrind)
- env: BUILDOPTIONS='--with-cc=gcc-5 --with-m32'
addons:
apt:
@@ -82,7 +82,7 @@ matrix:
- libc6-dev-i386
- gcc-multilib
- # clang for the 32-bit architecture (no valgrind yet)
+ # clang for the 32-bit architecture (no valgrind)
- env: BUILDOPTIONS='--with-cc=clang-7 --with-m32'
addons:
apt:
@@ -100,25 +100,6 @@ matrix:
#- env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-7 --cflags=-DMP_32BIT --with-travis-valgrind --make-option=tune'
- env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-7 --with-travis-valgrind --make-option=tune'
- # clang for x86-64 architecture (64-bit longs and 64-bit pointers)
- - env: SANITIZER=1 CONV_WARNINGS=relaxed BUILDOPTIONS='--with-cc=clang-7 --with-m64 --with-travis-valgrind'
- - env: SANITIZER=1 CONV_WARNINGS=strict BUILDOPTIONS='--with-cc=clang-7 --with-m64 --with-travis-valgrind'
- - env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-6.0 --with-m64 --with-travis-valgrind'
- addons:
- apt:
- packages:
- - clang-6.0
- - env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-5.0 --with-m64 --with-travis-valgrind'
- addons:
- apt:
- packages:
- - clang-5.0
- - env: BUILDOPTIONS='--with-cc=clang-4.0 --with-m64 --with-travis-valgrind'
- addons:
- apt:
- packages:
- - clang-4.0
-
# GCC for the x64_32 architecture (32-bit longs and 32-bit pointers)
# TODO: Probably not possible to run anything in x32 in Travis
# but needs to be checked to be sure.
@@ -142,6 +123,25 @@ matrix:
packages:
- gcc-4.8
+ # clang for x86-64 architecture (64-bit longs and 64-bit pointers)
+ - env: SANITIZER=1 CONV_WARNINGS=relaxed BUILDOPTIONS='--with-cc=clang-7 --with-m64 --with-travis-valgrind'
+ - env: SANITIZER=1 CONV_WARNINGS=strict BUILDOPTIONS='--with-cc=clang-7 --with-m64 --with-travis-valgrind'
+ - env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-6.0 --with-m64 --with-travis-valgrind'
+ addons:
+ apt:
+ packages:
+ - clang-6.0
+ - env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-5.0 --with-m64 --with-travis-valgrind'
+ addons:
+ apt:
+ packages:
+ - clang-5.0
+ - env: BUILDOPTIONS='--with-cc=clang-4.0 --with-m64 --with-travis-valgrind'
+ addons:
+ apt:
+ packages:
+ - clang-4.0
+
# GCC for the x86-64 architecture with restricted limb sizes
# formerly started with the option "--with-low-mp" to testme.sh
# but testing all three in one run took to long and timed out.