Skip to content

Commit 89a48a4

Browse files
committed
CXX-1025 Use 16.04 for special variants
1 parent 22644bf commit 89a48a4

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

.mci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ variables:
3333

3434
## cmake flag variables
3535
cmake_flags:
36-
ubuntu_cmake_flags: &ubuntu_cmake_flags -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wno-attributes -Werror -Wno-error=missing-field-initializers"
37-
osx_cmake_flags: &osx_cmake_flags -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Wall -Wextra -Wno-attributes -Werror -Wno-error=missing-field-initializers" -DBSONCXX_POLY_USE_BOOST=ON
38-
asan_cmake_flags: &asan_cmake_flags -DCMAKE_CXX_FLAGS="-fsanitize=address -O1 -fno-omit-frame-pointer -Wall -Wextra -Wno-attributes -Werror -Wno-error=missing-field-initializers -Wno-error=maybe-uninitialized"
39-
ubsan_cmake_flags: &ubsan_cmake_flags -DCMAKE_CXX_COMPILER="/usr/bin/clang++" -DCMAKE_CXX_FLAGS="-fsanitize=undefined -g -fno-omit-frame-pointer -fsanitize-blacklist=$(pwd)/../etc/ubsan.blacklist -fno-sanitize-recover -Wall -Wextra -Wno-attributes -Werror -Wno-error=missing-field-initializers"
36+
ubuntu_cmake_flags: &ubuntu_cmake_flags -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -Wno-error=missing-field-initializers"
37+
osx_cmake_flags: &osx_cmake_flags -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Wall -Wextra -Werror" -DBSONCXX_POLY_USE_BOOST=ON
38+
asan_cmake_flags: &asan_cmake_flags -DCMAKE_CXX_COMPILER="/usr/bin/clang++" -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -fsanitize=address -O1 -g -fno-omit-frame-pointer -Wall -Wextra -Werror"
39+
ubsan_cmake_flags: &ubsan_cmake_flags -DCMAKE_CXX_COMPILER="/usr/bin/clang++" -DCMAKE_CXX_FLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -fsanitize=undefined -fsanitize-blacklist=$(pwd)/../etc/ubsan.blacklist -fno-sanitize-recover=undefined -O1 -g -fno-omit-frame-pointer -Wall -Wextra -Werror"
4040

4141
## test parameters
4242
test_params:
43-
asan_test_params: &asan_test_params ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.5 ASAN_OPTIONS="detect_leaks=1"
44-
ubsan_test_params: &ubsan_test_params UBSAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer UBSAN_OPTIONS="print_stacktrace=1"
43+
asan_test_params: &asan_test_params PATH="/usr/lib/llvm-3.8/bin" ASAN_OPTIONS="detect_leaks=1"
44+
ubsan_test_params: &ubsan_test_params PATH="usr/lib/llvm-3.8/bin" UBSAN_OPTIONS="print_stacktrace=1"
4545
valgrind_test_params: &valgrind_test_params valgrind --leak-check=full --track-origins=yes --num-callers=50 --error-exitcode=1 --error-limit=no --read-var-info=yes --suppressions=../etc/memcheck.suppressions
4646

4747

@@ -200,8 +200,8 @@ buildvariants:
200200
tasks:
201201
- name: compile_and_test
202202

203-
- name: ubuntu1410-debug-valgrind
204-
display_name: "Valgrind Ubuntu 14.10 Debug"
203+
- name: ubuntu1604-debug-valgrind
204+
display_name: "Valgrind Ubuntu 16.04 Debug"
205205
expansions:
206206
build_type: "Debug"
207207
source: *ubuntu_source
@@ -212,12 +212,12 @@ buildvariants:
212212
cmake_flags: *ubuntu_cmake_flags
213213
test_params: *valgrind_test_params
214214
run_on:
215-
- ubuntu1410-build
215+
- ubuntu1604-build
216216
tasks:
217217
- name: compile_and_test
218218

219-
- name: ubuntu1410-debug-asan
220-
display_name: "ASAN Ubuntu 14.10 Debug"
219+
- name: ubuntu1604-debug-asan
220+
display_name: "ASAN Ubuntu 16.04 Debug"
221221
expansions:
222222
build_type: "Debug"
223223
source: *ubuntu_source
@@ -228,12 +228,12 @@ buildvariants:
228228
cmake_flags: *asan_cmake_flags
229229
test_params: *asan_test_params
230230
run_on:
231-
- ubuntu1410-build
231+
- ubuntu1604-build
232232
tasks:
233233
- name: compile_and_test
234234

235-
- name: ubuntu1410-debug-ubsan
236-
display_name: "UBSAN Ubuntu 14.10 Debug"
235+
- name: ubuntu1604-debug-ubsan
236+
display_name: "UBSAN Ubuntu 16.04 Debug"
237237
expansions:
238238
build_type: "Debug"
239239
source: *ubuntu_source
@@ -244,6 +244,6 @@ buildvariants:
244244
cmake_flags: *ubsan_cmake_flags
245245
test_params: *ubsan_test_params
246246
run_on:
247-
- ubuntu1410-build
247+
- ubuntu1604-build
248248
tasks:
249249
- name: compile_and_test

src/mongocxx/test/pool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ TEST_CASE(
8383
ssl_opts.crl_file(crl_file);
8484
ssl_opts.allow_invalid_certificates(allow_invalid_certificates);
8585

86-
::mongoc_ssl_opt_t interposed = {0};
86+
::mongoc_ssl_opt_t interposed = {};
8787

8888
client_pool_set_ssl_opts->interpose(
8989
[&](::mongoc_client_pool_t*, const ::mongoc_ssl_opt_t* opts) {

0 commit comments

Comments
 (0)