From f6be7afe0987ef67e2db76cbdf2fd13bfa42c7f6 Mon Sep 17 00:00:00 2001 From: Jonh Wendell Date: Wed, 14 Aug 2024 16:01:44 -0400 Subject: [PATCH] Add missing `$BAZEL_STARTUP_ARGS` to `bazel info` command The lack of it might result in `bazel info` returning wrong results. --- Makefile.core.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index 6e6e2042079..f662fdf47f6 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -89,7 +89,7 @@ test: bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_BUILD_ARGS) $(BAZEL_CONFIG_CURRENT) -- $(BAZEL_TEST_TARGETS); \ fi if [ -n "$(E2E_TEST_TARGETS)" ]; then \ - env ENVOY_DEBUG=$(TEST_ENVOY_DEBUG) ENVOY_PATH=$(shell bazel info $(BAZEL_BUILD_ARGS) $(BAZEL_CONFIG_CURRENT) bazel-bin)/envoy $(E2E_TEST_ENVS) GO111MODULE=on go test -timeout 30m $(E2E_TEST_FLAGS) $(E2E_TEST_TARGETS); \ + env ENVOY_DEBUG=$(TEST_ENVOY_DEBUG) ENVOY_PATH=$(shell bazel $(BAZEL_STARTUP_ARGS) info $(BAZEL_BUILD_ARGS) $(BAZEL_CONFIG_CURRENT) bazel-bin)/envoy $(E2E_TEST_ENVS) GO111MODULE=on go test -timeout 30m $(E2E_TEST_FLAGS) $(E2E_TEST_TARGETS); \ fi test_asan: BAZEL_CONFIG_CURRENT = $(BAZEL_CONFIG_ASAN)