Skip to content

Commit 6957530

Browse files
committed
CDRIVER-1410 test with "experimental" off
1 parent a2cb051 commit 6957530

File tree

1 file changed

+34
-8
lines changed

1 file changed

+34
-8
lines changed

.mci.yml

+34-8
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ c_driver_variables:
157157
configure:
158158
standard: &configure_flags_default
159159
configure_flags: "--enable-experimental-features --enable-html-docs=no --enable-man-pages=no --enable-yelp=no --enable-examples=no --enable-optimizations --enable-maintainer-flags --disable-silent-rules --disable-automatic-init-and-cleanup --with-libbson=bundled"
160+
no_experimental: &configure_flags_no_experimental
161+
configure_flags: "--enable-html-docs=no --enable-man-pages=no --enable-yelp=no --enable-examples=no --enable-optimizations --enable-maintainer-flags --disable-silent-rules --disable-automatic-init-and-cleanup --with-libbson=bundled"
160162

161163
## Extra $PATH entries
162164
paths:
@@ -307,11 +309,11 @@ c_driver_variables:
307309
git submodule update --init
308310
cd src/libbson
309311
echo "MSBUILD: $MSBUILD, GENERATOR: $GENERATOR, CMAKE_DEFS: $CMAKE_DEFS"
310-
"$cmake" -G "$GENERATOR" "-DENABLE_EXPERIMENTAL_FEATURES=ON" "-DCMAKE_INSTALL_PREFIX=C:/mongo-c-driver"
312+
"$cmake" -G "$GENERATOR" "-DCMAKE_INSTALL_PREFIX=C:/mongo-c-driver"
311313
"$MSBUILD" /m ALL_BUILD.vcxproj
312314
"$MSBUILD" /m INSTALL.vcxproj
313315
cd ../..
314-
"$cmake" -G "$GENERATOR" "-DENABLE_EXPERIMENTAL_FEATURES=ON" "-DCMAKE_INSTALL_PREFIX=C:/mongo-c-driver" "-DBSON_ROOT_DIR=C:/mongo-c-driver" $CMAKE_DEFS
316+
"$cmake" -G "$GENERATOR" "-DCMAKE_INSTALL_PREFIX=C:/mongo-c-driver" "-DBSON_ROOT_DIR=C:/mongo-c-driver" $CMAKE_DEFS
315317
"$MSBUILD" /m ALL_BUILD.vcxproj
316318
"$MSBUILD" /m INSTALL.vcxproj
317319
(cd src/libbson && ./Debug/test-libbson.exe --no-fork -d)
@@ -431,7 +433,7 @@ c_driver_variables:
431433
msvc2010_32bit: &with_msvc2010_32bit
432434
generator: Visual Studio 10 2010
433435
# Evergreen builders only have 64-bit SSL and SASL available.
434-
cmake_defs: "-DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF"
436+
cmake_defs: "-DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF -DENABLE_EXPERIMENTAL_FEATURES=ON"
435437
msbuild: /cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe
436438
msvc2010: &with_msvc2010
437439
generator: Visual Studio 10 2010 Win64
@@ -440,7 +442,7 @@ c_driver_variables:
440442
msvc2013_32bit: &with_msvc2013_32bit
441443
generator: Visual Studio 12 2013
442444
# Evergreen builders only have 64-bit SSL and SASL available.
443-
cmake_defs: "-DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF"
445+
cmake_defs: "-DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF -DENABLE_EXPERIMENTAL_FEATURES=ON"
444446
msbuild: /cygdrive/c/Program Files (x86)/MSBuild/12.0/Bin/MSBuild.exe
445447
msvc2013: &with_msvc2013
446448
generator: Visual Studio 12 2013 Win64
@@ -450,11 +452,11 @@ c_driver_variables:
450452
generator: Visual Studio 12 2013 Win64
451453
msbuild: /cygdrive/c/Program Files (x86)/MSBuild/12.0/Bin/MSBuild.exe
452454
dllpath: "c:/openssl/bin,c:/sasl/bin"
453-
cmake_defs: "-DENABLE_SSL=WINDOWS"
455+
cmake_defs: "-DENABLE_SSL=WINDOWS -DENABLE_EXPERIMENTAL_FEATURES=ON"
454456
msvc2015_32bit: &with_msvc2015_32bit
455457
generator: Visual Studio 14 2015
456458
# Evergreen builders only have 64-bit SSL and SASL available.
457-
cmake_defs: "-DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF"
459+
cmake_defs: "-DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF -DENABLE_EXPERIMENTAL_FEATURES=ON"
458460
msbuild: /cygdrive/c/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
459461
msvc2015: &with_msvc2015
460462
generator: Visual Studio 14 2015 Win64
@@ -464,12 +466,17 @@ c_driver_variables:
464466
generator: Visual Studio 14 2015 Win64
465467
msbuild: /cygdrive/c/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
466468
dllpath: "c:/openssl/bin,c:/sasl/bin"
467-
cmake_defs: "-DENABLE_SSL=WINDOWS"
469+
cmake_defs: "-DENABLE_SSL=WINDOWS -DENABLE_EXPERIMENTAL_FEATURES=ON"
468470
msvc2015: &with_msvc2015_openssl
469471
generator: Visual Studio 14 2015 Win64
470472
msbuild: /cygdrive/c/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
471473
dllpath: "c:/openssl/bin,c:/sasl/bin"
472-
cmake_defs: "-DENABLE_SSL=OPENSSL"
474+
cmake_defs: "-DENABLE_SSL=OPENSSL -DENABLE_EXPERIMENTAL_FEATURES=ON"
475+
msvc2015: &with_msvc2015_no_experimental
476+
generator: Visual Studio 14 2015 Win64
477+
msbuild: /cygdrive/c/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
478+
dllpath: "c:/openssl/bin,c:/sasl/bin"
479+
cmake_defs: "-DENABLE_SSL=OPENSSL" # Omit "ENABLE_EXPERIMENTAL_FEATURES"
473480

474481
## all windows buildvariants have these attributes in common
475482
windows_common: &windows_common
@@ -1627,6 +1634,17 @@ buildvariants:
16271634
- windows-64-vs2015-compile
16281635
tasks: *topology_tests
16291636

1637+
- name: windows-64-vs2015-no-experimental
1638+
display_name: "Win VS2015 64 No-Experimental"
1639+
expansions:
1640+
<<: *msvc_common
1641+
<<: *mongo_url_windows64
1642+
<<: *with_msvc2015_no_experimental
1643+
run_on:
1644+
- windows-64-vs2015-compile
1645+
tasks:
1646+
- compile
1647+
16301648
- name: windows-64-vs2015-nativessl
16311649
display_name: "Win VS2015 64 NativeSSL"
16321650
expansions:
@@ -1769,3 +1787,11 @@ buildvariants:
17691787
- ubuntu1404-build
17701788
tasks: *compile_unix_variants
17711789

1790+
- name: compile-ubuntu1404-no-experimental
1791+
display_name: "Ubuntu 14.04 No-Experimental"
1792+
expansions:
1793+
CFLAGS: "-m64 -march=x86-64 -Werror"
1794+
<<: *configure_flags_no_experimental
1795+
run_on:
1796+
- ubuntu1404-build
1797+
tasks: *compile_most_unix_variants

0 commit comments

Comments
 (0)