Skip to content

CDRIVER-4240 add macOS m1 variant with compile task #923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 5, 2022
Merged

CDRIVER-4240 add macOS m1 variant with compile task #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
06eeac5
add macos_m1 variant (failing)
kevinAlbs Dec 29, 2021
1163c67
add xtrace to compile-unix.sh
kevinAlbs Dec 29, 2021
25a462e
add CMAKE_VERBOSE_MAKEFILE
kevinAlbs Dec 29, 2021
217b789
use -j1 to test
kevinAlbs Dec 29, 2021
f4637ab
use -DCMAKE_OSX_ARCHITECTURES=arm64 if compiling for macOS arm64
kevinAlbs Dec 29, 2021
6067750
add missing then
kevinAlbs Dec 29, 2021
b5c7ee1
disable /TLS/commonName on macOS
kevinAlbs Dec 29, 2021
d606768
revert scaffolding
kevinAlbs Dec 29, 2021
c49407f
generate evergreen confnig
kevinAlbs Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .evergreen/compile-unix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ case "$CC" in
;;
esac

if [ "darwin" = "$OS" -a "arm64" = "$MARCH" ]; then
CONFIGURE_FLAGS="$CONFIGURE_FLAGS -DCMAKE_OSX_ARCHITECTURES=arm64"
fi

CONFIGURE_FLAGS="$CONFIGURE_FLAGS $EXTRA_CONFIGURE_FLAGS"
export MONGOC_TEST_FUTURE_TIMEOUT_MS=30000
export MONGOC_TEST_SKIP_LIVE=on
Expand Down
7 changes: 7 additions & 0 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27502,3 +27502,10 @@ buildvariants:
- debug-compile-nosasl-openssl
- debug-compile-nosasl-nossl
- .versioned-api
- name: macos_m1
display_name: macOS m1 (Apple LLVM)
expansions:
CC: clang
run_on: macos-1100-arm64
tasks:
- debug-compile-sasl-darwinssl
7 changes: 6 additions & 1 deletion build/evergreen_config_lib/variants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,5 +671,10 @@ def days(n):
['debug-compile-nosasl-openssl',
'debug-compile-nosasl-nossl',
'.versioned-api'],
{})
{}),
Variant('macos_m1',
'macOS m1 (Apple LLVM)',
'macos-1100-arm64',
['debug-compile-sasl-darwinssl'],
{'CC': 'clang'}),
]
4 changes: 4 additions & 0 deletions src/libmongoc/tests/test-mongoc-stream-tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,11 @@ test_stream_tls_install (TestSuite *suite)
{
#if !defined(MONGOC_ENABLE_SSL_SECURE_CHANNEL) && \
!defined(MONGOC_ENABLE_SSL_LIBRESSL)

/* Disable /TLS/commonName on macOS due to CDRIVER-4256. */
#if !defined(MONGOC_ENABLE_SSL_SECURE_TRANSPORT)
TestSuite_Add (suite, "/TLS/commonName", test_mongoc_tls_common_name);
#endif
TestSuite_Add (suite, "/TLS/altname", test_mongoc_tls_altname);
TestSuite_Add (suite, "/TLS/basic", test_mongoc_tls_basic);
TestSuite_Add (suite,
Expand Down