diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-01-11 16:21:35 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-11 05:52:01 +0000 |
| commit | f80dee1f88e196c46938557d983e5133a66a81d0 (patch) | |
| tree | 7c827a1011c0f9137550f326a79a669b834d67ff | |
| parent | 53661ad572338e973fddf4355fc25e477fc41c78 (diff) | |
| download | mongo-f80dee1f88e196c46938557d983e5133a66a81d0.tar.gz | |
Import wiredtiger: ebed49118731c86ad5925a5f2a7108e4725bbc8b from branch mongodb-5.2
ref: 81f6768c90..ebed491187
for: 5.2.0-rc5
WT-8508 Define "test_env_vars" expansion for "unit test" function
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rwxr-xr-x | src/third_party/wiredtiger/test/evergreen.yml | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 68d4fc5b9c2..60bbcd641ce 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-5.2", - "commit": "81f6768c905d9902e51a26b3ebd5806828203330" + "commit": "ebed49118731c86ad5925a5f2a7108e4725bbc8b" } diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index 077335948ae..00a29408a0b 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -343,11 +343,6 @@ functions: script: | set -o errexit set -o verbose - - if [ "Windows_NT" = "$OS" ]; then - export "PATH=/cygdrive/c/Python39:/cygdrive/c/Python39/Scripts:$PATH" - export "PYTHONPATH=$(pwd)/../lang/python/wiredtiger):$(cygpath -w $(pwd)/../lang/python)" - fi if [ ${is_cmake_build|false} = true ]; then cd cmake_build else @@ -4273,6 +4268,10 @@ buildvariants: run_on: - windows-64-vs2017-test expansions: + test_env_vars: + WT_TOPDIR=$(git rev-parse --show-toplevel) + PATH=/cygdrive/c/Python39:/cygdrive/c/Python39/Scripts:$PATH + PYTHONPATH=($WT_TOPDIR/lang/python/wiredtiger):$(cygpath -w $WT_TOPDIR/lang/python) python_binary: 'python' scons_smp_command: -j $(echo "$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) * 2" | bc) tasks: @@ -4288,7 +4287,11 @@ buildvariants: expansions: python_binary: 'python' is_cmake_build: true - test_env_vars: WT_BUILDDIR=$(git rev-parse --show-toplevel)/cmake_build + test_env_vars: + WT_TOPDIR=$(git rev-parse --show-toplevel) + WT_BUILDDIR=$WT_TOPDIR/cmake_build + PATH=/cygdrive/c/Python39:/cygdrive/c/Python39/Scripts:$PATH + PYTHONPATH=($WT_TOPDIR/lang/python/wiredtiger):$(cygpath -w $WT_TOPDIR/lang/python) windows_configure_flags: -vcvars_bat "'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat'" tasks: - name: compile |