Skip to content

Commit 67d5d44

Browse files
authored
CDRIVER-4240 add macOS m1 variant with compile task (#923)
1 parent 9d2d8b1 commit 67d5d44

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

.evergreen/compile-unix.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@ case "$CC" in
195195
;;
196196
esac
197197

198+
if [ "darwin" = "$OS" -a "arm64" = "$MARCH" ]; then
199+
CONFIGURE_FLAGS="$CONFIGURE_FLAGS -DCMAKE_OSX_ARCHITECTURES=arm64"
200+
fi
201+
198202
CONFIGURE_FLAGS="$CONFIGURE_FLAGS $EXTRA_CONFIGURE_FLAGS"
199203
export MONGOC_TEST_FUTURE_TIMEOUT_MS=30000
200204
export MONGOC_TEST_SKIP_LIVE=on

.evergreen/config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27502,3 +27502,10 @@ buildvariants:
2750227502
- debug-compile-nosasl-openssl
2750327503
- debug-compile-nosasl-nossl
2750427504
- .versioned-api
27505+
- name: macos_m1
27506+
display_name: macOS m1 (Apple LLVM)
27507+
expansions:
27508+
CC: clang
27509+
run_on: macos-1100-arm64
27510+
tasks:
27511+
- debug-compile-sasl-darwinssl

build/evergreen_config_lib/variants.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,5 +671,10 @@ def days(n):
671671
['debug-compile-nosasl-openssl',
672672
'debug-compile-nosasl-nossl',
673673
'.versioned-api'],
674-
{})
674+
{}),
675+
Variant('macos_m1',
676+
'macOS m1 (Apple LLVM)',
677+
'macos-1100-arm64',
678+
['debug-compile-sasl-darwinssl'],
679+
{'CC': 'clang'}),
675680
]

src/libmongoc/tests/test-mongoc-stream-tls.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,11 @@ test_stream_tls_install (TestSuite *suite)
418418
{
419419
#if !defined(MONGOC_ENABLE_SSL_SECURE_CHANNEL) && \
420420
!defined(MONGOC_ENABLE_SSL_LIBRESSL)
421+
422+
/* Disable /TLS/commonName on macOS due to CDRIVER-4256. */
423+
#if !defined(MONGOC_ENABLE_SSL_SECURE_TRANSPORT)
421424
TestSuite_Add (suite, "/TLS/commonName", test_mongoc_tls_common_name);
425+
#endif
422426
TestSuite_Add (suite, "/TLS/altname", test_mongoc_tls_altname);
423427
TestSuite_Add (suite, "/TLS/basic", test_mongoc_tls_basic);
424428
TestSuite_Add (suite,

0 commit comments

Comments
 (0)