diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2017-06-24 03:01:13 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2017-06-24 03:01:13 +1000 |
| commit | cf713d9b8cf0436f08facc8171ffb407d380ea85 (patch) | |
| tree | 86df947be6762f82e30f5fe411024039d8b339dd /src/third_party/wiredtiger/test | |
| parent | a02c5e1cf53e83de05d3c98ed38673d91a350ce0 (diff) | |
| download | mongo-cf713d9b8cf0436f08facc8171ffb407d380ea85.tar.gz | |
Import wiredtiger: 2b048c9ad2dfde7ad9c2a1329bc082dfc882aec7 from branch mongodb-3.6
ref: 47e8c3d1d2..2b048c9ad2
for: 3.5.10
SERVER-29439 WiredTiger turtle file "MoveFileExW: Access is denied." error.
WT-3251 Remove interim buffer used to split pages during reconciliation
WT-3367 Switch OSX builders to 10.12
WT-3370 Heap use after free in txn recover code
WT-3371 Make Windows/MSVC build warnings fatal.
WT-3379 Avoid a performance regression on secondaries
Diffstat (limited to 'src/third_party/wiredtiger/test')
| -rw-r--r-- | src/third_party/wiredtiger/test/mciproject.yml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/test/mciproject.yml b/src/third_party/wiredtiger/test/mciproject.yml index 6456475aa00..72022fe46ec 100644 --- a/src/third_party/wiredtiger/test/mciproject.yml +++ b/src/third_party/wiredtiger/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 + |