Skip to content

Commit 26e67a7

Browse files
committed
SERVER-36656 Add canary builders for XCode 10 and XCode 10 with C++17
1 parent c5f382a commit 26e67a7

File tree

2 files changed

+98
-2
lines changed

2 files changed

+98
-2
lines changed

etc/evergreen.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11125,6 +11125,101 @@ buildvariants:
1112511125
distros:
1112611126
- rhel70-small
1112711127

11128+
- name: enterprise-osx-1011-xcode-10
11129+
display_name: ~ Enterprise macOS 10.11 (XCode 10)
11130+
modules:
11131+
- enterprise
11132+
run_on:
11133+
- macos-1014
11134+
batchtime: 1440 # 1 day
11135+
expansions:
11136+
test_flags: --excludeWithAnyTags=requires_ssl_mongo_tools
11137+
compile_env: DEVELOPER_DIR=/Applications/Xcode10.0.app
11138+
compile_flags: >-
11139+
--ssl
11140+
-j$(sysctl -n hw.logicalcpu)
11141+
--libc++
11142+
--variables-files=etc/scons/xcode_macosx.vars
11143+
num_jobs_available: 1
11144+
gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CGO_CPPFLAGS=-I/opt/mongodbtoolchain/v2/include CGO_CFLAGS=-mmacosx-version-min=10.11 CGO_LDFLAGS=-mmacosx-version-min=10.11'
11145+
tooltags: "-tags 'ssl sasl openssl_pre_1.0'"
11146+
build_mongoreplay: true
11147+
display_tasks:
11148+
- *dbtest
11149+
- *unittests
11150+
tasks:
11151+
- name: compile_all_run_unittests_TG
11152+
- name: audit
11153+
- name: auth_audit
11154+
- name: ese
11155+
- name: jsCore
11156+
- name: jsCore_auth
11157+
- name: jsCore_txns
11158+
- name: causally_consistent_jscore_txns_passthrough
11159+
- name: jstestfuzz
11160+
- name: jstestfuzz_concurrent
11161+
- name: jstestfuzz_concurrent_replication
11162+
- name: jstestfuzz_concurrent_sharded
11163+
- name: jstestfuzz_replication
11164+
- name: jstestfuzz_sharded
11165+
- name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
11166+
- name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
11167+
- name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
11168+
- name: replica_sets_auth
11169+
- name: replica_sets_jscore_passthrough
11170+
- name: sasl
11171+
- name: ssl
11172+
- name: sslSpecial
11173+
11174+
- name: enterprise-osx-1011-xcode-10-cxx17
11175+
display_name: ~ Enterprise macOS 10.11 (XCode 10 C++17)
11176+
modules:
11177+
- enterprise
11178+
run_on:
11179+
- macos-1014
11180+
batchtime: 1440 # 1 day
11181+
expansions:
11182+
test_flags: --excludeWithAnyTags=requires_ssl_mongo_tools
11183+
compile_env: DEVELOPER_DIR=/Applications/Xcode10.0.app
11184+
compile_flags: >-
11185+
--ssl
11186+
-j$(sysctl -n hw.logicalcpu)
11187+
--libc++
11188+
--variables-files=etc/scons/xcode_macosx.vars
11189+
--cxx-std=17
11190+
CPPDEFINES=_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
11191+
CXXFLAGS="-Wno-register"
11192+
num_jobs_available: 1
11193+
gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CGO_CPPFLAGS=-I/opt/mongodbtoolchain/v2/include CGO_CFLAGS=-mmacosx-version-min=10.11 CGO_LDFLAGS=-mmacosx-version-min=10.11'
11194+
tooltags: "-tags 'ssl sasl openssl_pre_1.0'"
11195+
build_mongoreplay: true
11196+
display_tasks:
11197+
- *dbtest
11198+
- *unittests
11199+
tasks:
11200+
- name: compile_all_run_unittests_TG
11201+
- name: audit
11202+
- name: auth_audit
11203+
- name: ese
11204+
- name: jsCore
11205+
- name: jsCore_auth
11206+
- name: jsCore_txns
11207+
- name: causally_consistent_jscore_txns_passthrough
11208+
- name: jstestfuzz
11209+
- name: jstestfuzz_concurrent
11210+
- name: jstestfuzz_concurrent_replication
11211+
- name: jstestfuzz_concurrent_sharded
11212+
- name: jstestfuzz_replication
11213+
- name: jstestfuzz_sharded
11214+
- name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
11215+
- name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
11216+
- name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
11217+
- name: replica_sets_auth
11218+
- name: replica_sets_jscore_passthrough
11219+
- name: sasl
11220+
- name: ssl
11221+
- name: sslSpecial
11222+
1112811223
- name: enterprise-osx-1010-openssl
1112911224
display_name: ~ Enterprise macOS 10.10 OpenSSL
1113011225
modules:

src/mongo/base/clonable_ptr_test.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include <functional>
3434
#include <memory>
35+
#include <tuple>
3536

3637
#include "mongo/unittest/unittest.h"
3738

@@ -256,7 +257,7 @@ void construction() {
256257
}
257258

258259
// Test move construction.
259-
{ mongo::clonable_ptr<Clonable>{mongo::clonable_ptr<Clonable>{}}; }
260+
{ std::ignore = mongo::clonable_ptr<Clonable>{mongo::clonable_ptr<Clonable>{}}; }
260261

261262
// Test copy construction.
262263
{
@@ -342,7 +343,7 @@ void augmentedConstruction() {
342343

343344
// Test move construction.
344345
{
345-
mongo::clonable_ptr<Clonable, CloneFactory>{
346+
std::ignore = mongo::clonable_ptr<Clonable, CloneFactory>{
346347
mongo::clonable_ptr<Clonable, CloneFactory>{Clonable::getCloningFunction()}};
347348
}
348349

0 commit comments

Comments
 (0)