@@ -45,13 +45,6 @@ matrix:
45
45
compiler : gcc-5
46
46
env : CONFIG_OPTS="--strict-warnings enable-tls1_3" TESTS="-test_fuzz" COMMENT="Move to the BORINGTEST build when interoperable"
47
47
- 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
55
48
compiler : clang-3.9
56
49
env : CONFIG_OPTS="--strict-warnings no-deprecated" BUILDONLY="yes"
57
50
- os : linux
@@ -83,33 +76,12 @@ matrix:
83
76
compiler : gcc-5
84
77
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
85
78
- 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
93
79
compiler : clang-3.9
94
80
env : EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan"
95
81
- 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
103
82
compiler : clang-3.9
104
83
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"
105
84
- 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
113
85
compiler : clang-3.9
114
86
env : EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-asan enable-rc5 enable-md2 enable-aria no-shared -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
115
87
- os : linux
@@ -167,7 +139,14 @@ before_script:
167
139
export CROSS_COMPILE=${CC%%gcc}; unset CC;
168
140
$srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
169
141
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
171
150
CC="ccache $CC";
172
151
fi;
173
152
$srcdir/config -v $CONFIG_OPTS;
0 commit comments