Skip to content

Commit 34c7b37

Browse files
committed
fix missing arg, test_basic_windows analysis test
1 parent 04fd4ee commit 34c7b37

2 files changed

Lines changed: 3 additions & 9 deletions

File tree

python/private/py_executable.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@ def _create_venv_unixy(ctx, *, venv_root, runtime, interpreter_actual_path):
701701

702702
venv_site_packages = "lib/python{}/site-packages".format(version)
703703
return _venv_details(
704+
interpreter = interpreter,
704705
pyvenv_cfg = pyvenv_cfg,
705706
venv_site_packages = venv_site_packages,
706707
bin_dir = bin_dir,

tests/base_rules/py_executable_base_tests.bzl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,20 @@ def _test_basic_windows(name, config):
4444
impl = _test_basic_windows_impl,
4545
target = name + "_subject",
4646
config_settings = {
47-
# NOTE: The default for this flag is based on the Bazel host OS, not
48-
# the target platform. For windows, it defaults to true, so force
49-
# it to that to match behavior when this test runs on other
50-
# platforms.
51-
# Pass value to both native and starlark versions of the flag until
52-
# the native one is removed.
53-
labels.BUILD_PYTHON_ZIP: True,
5447
"//command_line_option:cpu": "windows_x86_64",
5548
"//command_line_option:crosstool_top": CROSSTOOL_TOP,
5649
"//command_line_option:extra_execution_platforms": [platform_targets.WINDOWS_X86_64],
5750
"//command_line_option:extra_toolchains": [CC_TOOLCHAIN],
5851
"//command_line_option:platforms": [platform_targets.WINDOWS_X86_64],
59-
} | maybe_builtin_build_python_zip("true"),
52+
},
6053
attr_values = {},
6154
)
6255

6356
def _test_basic_windows_impl(env, target):
6457
target = env.expect.that_target(target)
6558
target.executable().path().contains(".exe")
6659
target.runfiles().contains_predicate(matching.str_endswith(
67-
target.meta.format_str("/{name}.zip"),
60+
target.meta.format_str("/{name}"),
6861
))
6962
target.runfiles().contains_predicate(matching.str_endswith(
7063
target.meta.format_str("/{name}.exe"),

0 commit comments

Comments
 (0)