Skip to content

Commit

Permalink
tests: make workspace CI jobs enable workspace mode (#2435)
Browse files Browse the repository at this point in the history
The CI setups claiming to run in WORKSPACE mode were wrong. This fixes
it.

Disable integration tests on Windows WORKSPACE mode. They are failing:
https://buildkite.com/bazel/rules-python-python/builds/9791#01934eac-3a03-445d-ad53-6683371ca289
Example failure: `java.lang.UnsatisfiedLinkError: 'int
com.google.devtools.build.lib.windows.WindowsFileOperations.nativeIsSymlinkOrJunction(java.lang.String,
boolean[], java.lang.String[])'`

---------

Co-authored-by: Richard Levasseur <[email protected]>
  • Loading branch information
comius and rickeylev authored Nov 21, 2024
1 parent 8ff4386 commit d73a74f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
23 changes: 23 additions & 0 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ tasks:
bazel: last_rc
ubuntu_workspace:
<<: *reusable_config
<<: *common_workspace_flags
name: "Default: Ubuntu, workspace"
platform: ubuntu2004
mac_workspace:
Expand All @@ -141,8 +142,30 @@ tasks:
platform: macos
windows_workspace:
<<: *reusable_config
<<: *common_workspace_flags
name: "Default: Windows, workspace"
platform: windows
# Most of tests/integration are failing on Windows w/workspace. Skip them
# for now until we can look into it.
build_targets:
- "--"
- "..."
# As a regression test for #225, check that wheel targets still build when
# their package path is qualified with the repo name.
- "@rules_python//examples/wheel/..."
build_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
- "--keep_going"
- "--build_tag_filters=-integration-test"
- "--config=bazel7.x"
test_targets:
- "--"
- "..."
test_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
- "--test_tag_filters=-integration-test"

debian:
<<: *reusable_config
Expand Down
5 changes: 3 additions & 2 deletions tests/integration/local_toolchains/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ def test_python_from_path_used(self):
[shell_path, "-c", "import sys; print(sys.executable)"],
text=True,
)
expected = expected.strip()
self.assertEqual(expected, sys.executable)
expected = expected.strip().lower()
# Normalize case: Windows may have case differences
self.assertEqual(expected.lower(), sys.executable.lower())


if __name__ == "__main__":
Expand Down

0 comments on commit d73a74f

Please sign in to comment.