Skip to content

Commit f8ecaf0

Browse files
committed
ok, a last one - reorder stuff ;-)
[skip ci]
1 parent c09efff commit f8ecaf0

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

.travis.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,29 +60,29 @@ matrix:
6060
# We have only one program and the variable $BUILDOPTIONS
6161
# has only the options to that program: testme.sh
6262

63-
# Run always with valgrind (no sanitizer, but debug info)
64-
- env: COMPILE_DEBUG=1 BUILDOPTIONS='--with-cc=gcc-4.9 --with-m64 --with-valgrind'
63+
# Check source code format
64+
- env: BUILDOPTIONS='--format'
6565
addons:
6666
apt:
6767
packages:
68-
- gcc-4.9
68+
- astyle
6969

70-
# Check source code format
71-
- env: BUILDOPTIONS='--format'
70+
# Run always with valgrind (no sanitizer, but debug info)
71+
- env: COMPILE_DEBUG=1 BUILDOPTIONS='--with-cc=gcc-4.9 --with-m64 --with-valgrind'
7272
addons:
7373
apt:
7474
packages:
75-
- astyle
75+
- gcc-4.9
7676

77-
# GCC for the 32-bit architecture (no valgrind yet)
77+
# GCC for the 32-bit architecture (no valgrind)
7878
- env: BUILDOPTIONS='--with-cc=gcc-5 --with-m32'
7979
addons:
8080
apt:
8181
packages:
8282
- libc6-dev-i386
8383
- gcc-multilib
8484

85-
# clang for the 32-bit architecture (no valgrind yet)
85+
# clang for the 32-bit architecture (no valgrind)
8686
- env: BUILDOPTIONS='--with-cc=clang-7 --with-m32'
8787
addons:
8888
apt:
@@ -100,25 +100,6 @@ matrix:
100100
#- env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-7 --cflags=-DMP_32BIT --with-travis-valgrind --make-option=tune'
101101
- env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-7 --with-travis-valgrind --make-option=tune'
102102

103-
# clang for x86-64 architecture (64-bit longs and 64-bit pointers)
104-
- env: SANITIZER=1 CONV_WARNINGS=relaxed BUILDOPTIONS='--with-cc=clang-7 --with-m64 --with-travis-valgrind'
105-
- env: SANITIZER=1 CONV_WARNINGS=strict BUILDOPTIONS='--with-cc=clang-7 --with-m64 --with-travis-valgrind'
106-
- env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-6.0 --with-m64 --with-travis-valgrind'
107-
addons:
108-
apt:
109-
packages:
110-
- clang-6.0
111-
- env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-5.0 --with-m64 --with-travis-valgrind'
112-
addons:
113-
apt:
114-
packages:
115-
- clang-5.0
116-
- env: BUILDOPTIONS='--with-cc=clang-4.0 --with-m64 --with-travis-valgrind'
117-
addons:
118-
apt:
119-
packages:
120-
- clang-4.0
121-
122103
# GCC for the x64_32 architecture (32-bit longs and 32-bit pointers)
123104
# TODO: Probably not possible to run anything in x32 in Travis
124105
# but needs to be checked to be sure.
@@ -142,6 +123,25 @@ matrix:
142123
packages:
143124
- gcc-4.8
144125

126+
# clang for x86-64 architecture (64-bit longs and 64-bit pointers)
127+
- env: SANITIZER=1 CONV_WARNINGS=relaxed BUILDOPTIONS='--with-cc=clang-7 --with-m64 --with-travis-valgrind'
128+
- env: SANITIZER=1 CONV_WARNINGS=strict BUILDOPTIONS='--with-cc=clang-7 --with-m64 --with-travis-valgrind'
129+
- env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-6.0 --with-m64 --with-travis-valgrind'
130+
addons:
131+
apt:
132+
packages:
133+
- clang-6.0
134+
- env: SANITIZER=1 BUILDOPTIONS='--with-cc=clang-5.0 --with-m64 --with-travis-valgrind'
135+
addons:
136+
apt:
137+
packages:
138+
- clang-5.0
139+
- env: BUILDOPTIONS='--with-cc=clang-4.0 --with-m64 --with-travis-valgrind'
140+
addons:
141+
apt:
142+
packages:
143+
- clang-4.0
144+
145145
# GCC for the x86-64 architecture with restricted limb sizes
146146
# formerly started with the option "--with-low-mp" to testme.sh
147147
# but testing all three in one run took to long and timed out.

0 commit comments

Comments
 (0)