Skip to content

Commit 404c76f

Browse files
committed
Fix travis clang-3.9 builds
Something environmental changed in travis so that it started preferring the ubuntu clang-3.9 version instead of the llvm.org one. This breaks the sanitiser based builds. This change forces travis to de-prioritise the ubuntu clang packages. [extended tests] Reviewed-by: Rich Salz <[email protected]> (Merged from openssl#3759)
1 parent 25ffeb1 commit 404c76f

File tree

2 files changed

+23
-29
lines changed

2 files changed

+23
-29
lines changed

.travis-apt-pin.preferences

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Package: clang-3.9
2+
Pin: release o=Ubuntu
3+
Pin-Priority: -1
4+
5+
Package: libclang-common-3.9-dev
6+
Pin: release o=Ubuntu
7+
Pin-Priority: -1
8+
9+
Package: libclang1-3.9
10+
Pin: release o=Ubuntu
11+
Pin-Priority: -1
12+
13+
Package: libllvm3.9v4
14+
Pin: release o=Ubuntu
15+
Pin-Priority: -1

.travis.yml

+8-29
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ matrix:
4545
compiler: gcc-5
4646
env: CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable"
4747
- os: linux
48-
addons:
49-
apt:
50-
packages:
51-
- clang-3.9
52-
sources:
53-
- llvm-toolchain-trusty-3.9
54-
- ubuntu-toolchain-r-test
5548
compiler: clang-3.9
5649
env: CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes"
5750
- os: linux
@@ -83,33 +76,12 @@ matrix:
8376
compiler: gcc-5
8477
env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests" BORINGSSL_TESTS="yes" CXX="g++-5" TESTS=95
8578
- os: linux
86-
addons:
87-
apt:
88-
packages:
89-
- clang-3.9
90-
sources:
91-
- llvm-toolchain-trusty-3.9
92-
- ubuntu-toolchain-r-test
9379
compiler: clang-3.9
9480
env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan"
9581
- os: linux
96-
addons:
97-
apt:
98-
packages:
99-
- clang-3.9
100-
sources:
101-
- llvm-toolchain-trusty-3.9
102-
- ubuntu-toolchain-r-test
10382
compiler: clang-3.9
10483
env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-aria enable-ssl3 enable-ssl3-method enable-nextprotoneg -fno-sanitize=alignment no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
10584
- os: linux
106-
addons:
107-
apt:
108-
packages:
109-
- clang-3.9
110-
sources:
111-
- llvm-toolchain-trusty-3.9
112-
- ubuntu-toolchain-r-test
11385
compiler: clang-3.9
11486
env: EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
11587
- os: linux
@@ -167,7 +139,14 @@ before_script:
167139
export CROSS_COMPILE=${CC%%gcc}; unset CC;
168140
$srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
169141
else
170-
if which ccache >/dev/null && [ "$CC" != clang-3.9 ]; then
142+
if [ "$CC" == clang-3.9 ]; then
143+
sudo cp .travis-apt-pin.preferences /etc/apt/preferences.d/no-ubuntu-clang;
144+
curl -sSL "http://apt.llvm.org/llvm-snapshot.gpg.key" | sudo -E apt-key add -;
145+
echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main" | sudo tee -a /etc/apt/sources.list > /dev/null;
146+
sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test";
147+
sudo -E apt-get -yq update;
148+
sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install clang-3.9;
149+
elif which ccache >/dev/null; then
171150
CC="ccache $CC";
172151
fi;
173152
$srcdir/config -v $CONFIG_OPTS;

0 commit comments

Comments
 (0)