From c2bf8106389e3b1595a24fbac324ad02952c009b Mon Sep 17 00:00:00 2001 From: Philipp Schrader Date: Wed, 10 May 2023 21:35:58 -0700 Subject: [PATCH] Fix //tests/ts:bazel_repository_test (#7952) The test was not actually invoking the bazel that was downloaded with the `http_file` rule. I failed to add `executable = True` to the `http_file` call. This caused the test to ignore that bazel binary and went to the next one on the system. This patch fixes the issue by adding the missing attribute. Also, this patch changes the check in the test to make sure that the downloaded file is indeed executable. --- WORKSPACE | 1 + tests/ts/bazel_repository_test.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 9f70edd44..d7a8b2ca7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -148,6 +148,7 @@ esbuild_register_toolchains( http_file( name = "bazel_linux_x86_64", downloaded_file_path = "bazel", + executable = True, sha256 = "e89747d63443e225b140d7d37ded952dacea73aaed896bca01ccd745827c6289", urls = [ "https://github.com/bazelbuild/bazel/releases/download/6.1.2/bazel-6.1.2-linux-x86_64", diff --git a/tests/ts/bazel_repository_test.sh b/tests/ts/bazel_repository_test.sh index 503080932..94e115c74 100755 --- a/tests/ts/bazel_repository_test.sh +++ b/tests/ts/bazel_repository_test.sh @@ -17,7 +17,7 @@ source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \ BAZEL_BIN="$(rlocation bazel_linux_x86_64/file/bazel)" readonly BAZEL_BIN -if [[ ! -e "${BAZEL_BIN}" ]]; then +if [[ ! -x "${BAZEL_BIN}" ]]; then echo "Failed to find the bazel binary." >&2 exit 1 fi