Skip to content

tests: use $(rootpaths) to get executable files paths for Bazel 8 compatibility #2395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 12, 2024
Merged

tests: use $(rootpaths) to get executable files paths for Bazel 8 compatibility #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e265eeb
Add protobuf dependency
comius Oct 11, 2024
edc99ce
fixup! Merge remote-tracking branch 'upstream/main' into remove-cc-defs
rickeylev Oct 20, 2024
c03f325
wip: bzlmod example with bazel 8 pass
rickeylev Nov 12, 2024
98c35b5
update lock file
rickeylev Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ examples/py_proto_library/bazel-py_proto_library
tests/integration/compile_pip_requirements/bazel-compile_pip_requirements
tests/integration/ignore_root_user_error/bazel-ignore_root_user_error
tests/integration/local_toolchains/bazel-local_toolchains
tests/integration/py_cc_toolchain_registered/bazel-py_cc_toolchain_registered
6 changes: 3 additions & 3 deletions examples/bzlmod/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions examples/bzlmod/tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ sh_test(
data = [":version_default"],
env = {
"VERSION_CHECK": "3.9", # The default defined in the WORKSPACE.
"VERSION_PY_BINARY": "$(rootpath :version_default)",
"VERSION_PY_BINARY": "$(rootpaths :version_default)",
},
)

Expand All @@ -173,7 +173,7 @@ sh_test(
data = [":version_3_9"],
env = {
"VERSION_CHECK": "3.9",
"VERSION_PY_BINARY": "$(rootpath :version_3_9)",
"VERSION_PY_BINARY": "$(rootpaths :version_3_9)",
},
)

Expand All @@ -183,6 +183,6 @@ sh_test(
data = [":version_3_10"],
env = {
"VERSION_CHECK": "3.10",
"VERSION_PY_BINARY": "$(rootpath :version_3_10)",
"VERSION_PY_BINARY": "$(rootpaths :version_3_10)",
},
)
6 changes: 5 additions & 1 deletion examples/bzlmod/tests/version_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@

set -o errexit -o nounset -o pipefail

version_py_binary=$("${VERSION_PY_BINARY}")
# VERSION_PY_BINARY is a space separate list of the executable and its main
# py file. We just want the executable.
bin=($VERSION_PY_BINARY)
bin="${bin[@]//*.py}"
version_py_binary=$($bin)

if [[ "${version_py_binary}" != "${VERSION_CHECK}" ]]; then
echo >&2 "expected version '${VERSION_CHECK}' is different than returned '${version_py_binary}'"
Expand Down