Skip to content

Commit 5e3cb6f

Browse files
etretr
authored
Moved compiler checks to clang
1 parent 4cda642 commit 5e3cb6f

File tree

1 file changed

+21
-74
lines changed

1 file changed

+21
-74
lines changed

‎.travis.yml‎

Lines changed: 21 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ before_install:
2828
- sudo make install
2929
- cd ..
3030
- if [ "$BUILD_TYPE" = "asan" ]; then export CFLAGS='-fsanitize=address'; export LDFLAGS='-fsanitize=address'; fi
31-
- if [ "$BUILD_TYPE" = "asanpc" ]; then export CFLAGS='-fsanitize=address -fsanitize=pointer-compare'; export LDFLAGS='-fsanitize=address -fsanitize=pointer-compare'; fi
32-
- if [ "$BUILD_TYPE" = "asanps" ]; then export CFLAGS='-fsanitize=address -fsanitize=pointer-subtract'; export LDFLAGS='-fsanitize=address -fsanitize=pointer-subtract'; fi
31+
- if [ "$BUILD_TYPE" = "msan" ]; then export CFLAGS='-fsanitize=memory'; export LDFLAGS='-fsanitize=memory'; fi
3332
- if [ "$BUILD_TYPE" = "lsan" ]; then export CFLAGS='-fsanitize=leak'; export LDFLAGS='-fsanitize=leak'; fi
3433
- if [ "$BUILD_TYPE" = "tsan" ]; then export CFLAGS='-fsanitize=thread'; export LDFLAGS='-fsanitize=thread'; fi
3534
- if [ "$BUILD_TYPE" = "ubsan" ]; then export export CFLAGS='-fsanitize=undefined'; export LDFLAGS='-fsanitize=undefined'; fi
@@ -102,97 +101,46 @@ matrix:
102101
apt:
103102
sources:
104103
- ubuntu-toolchain-r-test
104+
- llvm-toolchain-precise-3.8
105105
packages:
106-
- g++-7
107-
- libasan4
108-
- libasan4-dbg
109-
- libtsan0
110-
- libtsan0-dbg
111-
- liblsan0
112-
- liblsan0-dbg
113-
- libubsan0
114-
- libubsan0-dbg
115-
env: MATRIX_EVAL="BUILD_TYPE=asan && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
116-
- os: linux
117-
addons:
118-
apt:
119-
sources:
120-
- ubuntu-toolchain-r-test
121-
packages:
122-
- g++-7
123-
- libasan4
124-
- libasan4-dbg
125-
- libtsan0
126-
- libtsan0-dbg
127-
- liblsan0
128-
- liblsan0-dbg
129-
- libubsan0
130-
- libubsan0-dbg
131-
env: MATRIX_EVAL="BUILD_TYPE=asanpc && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
106+
- clang-3.8
107+
env: MATRIX_EVAL="BUILD_TYPE=asan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
132108
- os: linux
133109
addons:
134110
apt:
135111
sources:
136112
- ubuntu-toolchain-r-test
113+
- llvm-toolchain-precise-3.8
137114
packages:
138-
- g++-7
139-
- libasan4
140-
- libasan4-dbg
141-
- libtsan0
142-
- libtsan0-dbg
143-
- liblsan0
144-
- liblsan0-dbg
145-
- libubsan0
146-
- libubsan0-dbg
147-
env: MATRIX_EVAL="BUILD_TYPE=asanps && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
115+
- clang-3.8
116+
env: MATRIX_EVAL="BUILD_TYPE=msan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
148117
- os: linux
149118
addons:
150119
apt:
151120
sources:
152121
- ubuntu-toolchain-r-test
122+
- llvm-toolchain-precise-3.8
153123
packages:
154-
- g++-7
155-
- libasan4
156-
- libasan4-dbg
157-
- libtsan0
158-
- libtsan0-dbg
159-
- liblsan0
160-
- liblsan0-dbg
161-
- libubsan0
162-
- libubsan0-dbg
163-
env: MATRIX_EVAL="BUILD_TYPE=lsan && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
124+
- clang-3.8
125+
env: MATRIX_EVAL="BUILD_TYPE=lsan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
164126
- os: linux
165127
addons:
166128
apt:
167129
sources:
168130
- ubuntu-toolchain-r-test
131+
- llvm-toolchain-precise-3.8
169132
packages:
170-
- g++-7
171-
- libasan4
172-
- libasan4-dbg
173-
- libtsan0
174-
- libtsan0-dbg
175-
- liblsan0
176-
- liblsan0-dbg
177-
- libubsan0
178-
- libubsan0-dbg
179-
env: MATRIX_EVAL="BUILD_TYPE=tsan && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
133+
- clang-3.8
134+
env: MATRIX_EVAL="BUILD_TYPE=tsan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
180135
- os: linux
181136
addons:
182137
apt:
183138
sources:
184139
- ubuntu-toolchain-r-test
140+
- llvm-toolchain-precise-3.8
185141
packages:
186-
- g++-7
187-
- libasan4
188-
- libasan4-dbg
189-
- libtsan0
190-
- libtsan0-dbg
191-
- liblsan0
192-
- liblsan0-dbg
193-
- libubsan0
194-
- libubsan0-dbg
195-
env: MATRIX_EVAL="BUILD_TYPE=ubsan && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
142+
- clang-3.8
143+
env: MATRIX_EVAL="BUILD_TYPE=ubsan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
196144
- os: linux
197145
addons:
198146
apt:
@@ -331,9 +279,8 @@ matrix:
331279
allow_failures:
332280
- env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_ARCH_DIR=arm-linux-gnueabi && CC=arm-linux-gnueabi-gcc"
333281
- env: MATRIX_EVAL="CROSS_COMPILE=1 && ARM_LD_PATH=$HOME/linker_bin && ARM_ARCH_DIR=aarch64-linux-gnu"
334-
- env: MATRIX_EVAL="BUILD_TYPE=asan && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
335-
- env: MATRIX_EVAL="BUILD_TYPE=asanpc && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
336-
- env: MATRIX_EVAL="BUILD_TYPE=asanps && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
337-
- env: MATRIX_EVAL="BUILD_TYPE=lsan && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
338-
- env: MATRIX_EVAL="BUILD_TYPE=tsan && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
339-
- env: MATRIX_EVAL="BUILD_TYPE=ubsan && CC=gcc-7 && CXX=g++-7 && DEBUG=debug"
282+
- env: MATRIX_EVAL="BUILD_TYPE=asan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
283+
- env: MATRIX_EVAL="BUILD_TYPE=msan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
284+
- env: MATRIX_EVAL="BUILD_TYPE=lsan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
285+
- env: MATRIX_EVAL="BUILD_TYPE=tsan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"
286+
- env: MATRIX_EVAL="BUILD_TYPE=ubsan && CC=clang-3.8 && CXX=clang++-3.8 && DEBUG=debug"

0 commit comments

Comments
 (0)