diff options
| author | Mark Benvenuto <markbenvenuto@users.noreply.github.com> | 2017-06-14 16:51:20 -0400 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-06-14 16:51:20 -0400 |
| commit | 625cbb33b9c39e6bb1fa00f21f3beb5573d645d6 (patch) | |
| tree | b1d2b0b708e1dd2e5eb08ed8bef79a46761e8d9a | |
| parent | e560dbee85143ecc78c9e6b41b66af179a9f81a5 (diff) | |
| download | mongo-625cbb33b9c39e6bb1fa00f21f3beb5573d645d6.tar.gz | |
WT-3367 Fix test linking to support macOS 10.12 (#3463)
| -rw-r--r-- | test/mciproject.yml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/test/mciproject.yml b/test/mciproject.yml index 6456475aa00..72022fe46ec 100644 --- a/test/mciproject.yml +++ b/test/mciproject.yml @@ -95,6 +95,16 @@ tasks: script: | set -o errexit set -o verbose + + # On 10.12, change the binary location with install_name_tool since DYLD_LIBRARY_PATH + # appears not to work for dynamic modules loaded by python. For wt, the libtool generated + # script has the wrong path for running on test machines. + if [ "$(uname -s)" == "Darwin" ]; then + WT_VERSION=$(m4 build_posix/aclocal/version.m4) + install_name_tool -change /usr/local/lib/libwiredtiger-$WT_VERSION.dylib $(pwd)/.libs/libwiredtiger-$WT_VERSION.dylib lang/python/_wiredtiger.so + install_name_tool -change /usr/local/lib/libwiredtiger-$WT_VERSION.dylib $(pwd)/.libs/libwiredtiger-$WT_VERSION.dylib .libs/wt + fi + ${test_env_vars|} python ./test/suite/run.py -v 2 ${smp_command|} 2>&1 - name: compile-windows-alt @@ -182,10 +192,10 @@ buildvariants: #- name: format - Enable when we have a solution for hangs and crashses - name: fops -- name: osx-1010 - display_name: OS X 10.10 +- name: macos-1012 + display_name: OS X 10.12 run_on: - - osx-1010 + - macos-1012 expansions: smp_command: -j $(sysctl -n hw.logicalcpu) configure_env_vars: PATH=/opt/local/bin:$PATH @@ -195,3 +205,4 @@ buildvariants: - name: compile - name: unit-test - name: fops + |