Skip to content

Commit 8a2badb

Browse files
committed
fix win32 handling
1 parent f68b594 commit 8a2badb

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.evergreen/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ functions:
6666
params:
6767
binary: bash
6868
working_dir: "src"
69-
include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY, PYTHON_VERSION,
69+
include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY, PYTHON_VERSION, IS_WIN32,
7070
STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER, LOCAL_ATLAS, NO_EXT]
7171
args: [.evergreen/just.sh, run-server, "${TEST_NAME}"]
7272
- command: expansions.update
@@ -87,7 +87,7 @@ functions:
8787
type: test
8888
params:
8989
include_expansions_in_env: [AUTH, SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,
90-
AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI, PYTHON_VERSION,
90+
AWS_SESSION_TOKEN, COVERAGE, PYTHON_BINARY, LIBMONGOCRYPT_URL, MONGODB_URI, PYTHON_VERSION, IS_WIN32,
9191
DISABLE_TEST_COMMANDS, GREEN_FRAMEWORK, NO_EXT, COMPRESSORS, MONGODB_API_VERSION, DEBUG_LOG,
9292
ORCHESTRATION_FILE, OCSP_SERVER_TYPE, VERSION, REQUIRE_FIPS]
9393
binary: bash

.evergreen/scripts/generate_config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ def create_standard_nonlinux_variants() -> list[BuildVariant]:
9191
]
9292
host = HOSTS[host_name]
9393
tags = ["standard-non-linux"]
94+
expansions = dict()
95+
if host_name == "win32":
96+
expansions["IS_WIN32"] = "1"
9497
display_name = get_variant_name(base_display_name, host)
9598
variant = create_variant(tasks, display_name, host=host, tags=tags)
9699
variants.append(variant)

.evergreen/utils.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,11 @@ get_python_binary() {
123123
PYTHON="/Library/Frameworks/Python.Framework/Versions/$version/bin/python3"
124124
elif [ "Windows_NT" = "${OS:-}" ]; then
125125
version=$(echo $version | cut -d. -f1,2 | sed 's/\.//g')
126-
PYTHON="C:/python/Python$version/python.exe"
126+
if [ -n "${IS_WIN32:-}" ]; then
127+
PYTHON="C:/python/32/Python$version/python.exe"
128+
else
129+
PYTHON="C:/python/Python$version/python.exe"
130+
fi
127131
else
128132
PYTHON="/opt/python/$version/bin/python3"
129133
fi

0 commit comments

Comments
 (0)