From aa809e5a3889be41c5dcbc2555b7a469df363fe5 Mon Sep 17 00:00:00 2001 From: mai93 Date: Mon, 14 Dec 2020 11:44:14 +0200 Subject: [PATCH 01/12] Return execution configuration without applying any transition --- .../lib/analysis/config/ExecutionTransitionFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index 54c07569fc196d..c0ee7501ae1ae3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,8 +109,9 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null) { - // No execution platform is known, so don't change anything. + if (executionPlatform == null || options.get(CoreOptions.class).isExec) { + // If no execution platform is known or the input already comes from execution configuration, + // don't change anything and return the existing value. return options.underlying(); } return cache.applyTransition( From 480f5bac1cee757d1fa1f91e2ee16ddffb3013a8 Mon Sep 17 00:00:00 2001 From: mai93 Date: Mon, 14 Dec 2020 13:50:37 +0200 Subject: [PATCH 02/12] Revert "Return execution configuration without applying any transition" This reverts commit aa809e5a3889be41c5dcbc2555b7a469df363fe5. --- .../lib/analysis/config/ExecutionTransitionFactory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index c0ee7501ae1ae3..54c07569fc196d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,9 +109,8 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null || options.get(CoreOptions.class).isExec) { - // If no execution platform is known or the input already comes from execution configuration, - // don't change anything and return the existing value. + if (executionPlatform == null) { + // No execution platform is known, so don't change anything. return options.underlying(); } return cache.applyTransition( From 11e496bde8feeb6963b472f73a7889a1392cef88 Mon Sep 17 00:00:00 2001 From: mai93 Date: Mon, 14 Dec 2020 14:15:41 +0200 Subject: [PATCH 03/12] Retry initial commit --- .../lib/analysis/config/ExecutionTransitionFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index 54c07569fc196d..c0ee7501ae1ae3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,8 +109,9 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null) { - // No execution platform is known, so don't change anything. + if (executionPlatform == null || options.get(CoreOptions.class).isExec) { + // If no execution platform is known or the input already comes from execution configuration, + // don't change anything and return the existing value. return options.underlying(); } return cache.applyTransition( From 59661a63ab6f962685acedf22933f0abe2417371 Mon Sep 17 00:00:00 2001 From: mai93 Date: Mon, 14 Dec 2020 17:08:01 +0200 Subject: [PATCH 04/12] Remove java.management from jdeps_modules.golden --- src/jdeps_modules.golden | 1 - 1 file changed, 1 deletion(-) diff --git a/src/jdeps_modules.golden b/src/jdeps_modules.golden index 4584f9d392fdfc..e3f2deeb59f97c 100644 --- a/src/jdeps_modules.golden +++ b/src/jdeps_modules.golden @@ -2,7 +2,6 @@ java.base java.compiler java.instrument java.logging -java.management java.naming java.sql java.xml From 6acbd9a64dc5de6a6b10857b8f0d7798d90b7a56 Mon Sep 17 00:00:00 2001 From: mai93 Date: Tue, 15 Dec 2020 15:59:04 +0200 Subject: [PATCH 05/12] Pass host_action_env to hostActionEnvironment attribute of host options --- src/jdeps_modules.golden | 1 + .../devtools/build/lib/analysis/config/CoreOptions.java | 1 + .../lib/analysis/config/ExecutionTransitionFactory.java | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jdeps_modules.golden b/src/jdeps_modules.golden index e3f2deeb59f97c..4584f9d392fdfc 100644 --- a/src/jdeps_modules.golden +++ b/src/jdeps_modules.golden @@ -2,6 +2,7 @@ java.base java.compiler java.instrument java.logging +java.management java.naming java.sql java.xml diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java index 64c84910b5abc1..bdc712ffb98b7c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java @@ -963,6 +963,7 @@ public FragmentOptions getHost() { // Pass host action environment variables host.actionEnvironment = hostActionEnvironment; + host.hostActionEnvironment = hostActionEnvironment; return host; } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index c0ee7501ae1ae3..54c07569fc196d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,9 +109,8 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null || options.get(CoreOptions.class).isExec) { - // If no execution platform is known or the input already comes from execution configuration, - // don't change anything and return the existing value. + if (executionPlatform == null) { + // No execution platform is known, so don't change anything. return options.underlying(); } return cache.applyTransition( From 4fbc56dcbc1f5ffabf9ea85a03c98f0ddc5498c8 Mon Sep 17 00:00:00 2001 From: mai93 Date: Wed, 16 Dec 2020 13:50:51 +0200 Subject: [PATCH 06/12] Adding unit test for host_action_env option --- src/test/shell/integration/action_env_test.sh | 222 ++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/src/test/shell/integration/action_env_test.sh b/src/test/shell/integration/action_env_test.sh index 933bcd344e2020..e83bde5a6cff12 100755 --- a/src/test/shell/integration/action_env_test.sh +++ b/src/test/shell/integration/action_env_test.sh @@ -44,6 +44,27 @@ sh_test( name = "test_env_foo", srcs = ["test_env_foo.sh"], ) + +genrule( + name = "show_host_env_using_tools", + tools = ["env.txt"], + outs = ["tools_env.txt"], + cmd = "cp \$(location env.txt) \"\$@\"" +) + +genrule( + name = "show_host_env_using_exec_tools", + exec_tools = ["env.txt"], + outs = ["exec_tools_env.txt"], + cmd = "cp \$(location env.txt) \"\$@\"" +) + +genrule( + name = "show_host_env_using_successive_exec_tools", + exec_tools = ["exec_tools_env.txt"], + outs = ["successive_exec_tools_env.txt"], + cmd = "cp \$(location exec_tools_env.txt) \"\$@\"" +) EOF cat > pkg/build.bzl < $TEST_log + expect_log "FOO=bar" + + # But if FOO is passed using --action_env, it should not be listed in host env vars + bazel build --action_env=FOO=bar pkg:show_host_env_using_tools \ + || fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/tools_env.txt > $TEST_log + expect_not_log "FOO=bar" +} + +function test_host_env_using_tools_latest_wins() { + export FOO=environmentfoo + export BAR=environmentbar + bazel build --host_action_env=FOO=foo \ + --host_action_env=BAR=willbeoverridden --host_action_env=BAR=bar pkg:show_host_env_using_tools \ + || fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/tools_env.txt > $TEST_log + expect_log "FOO=foo" + expect_log "BAR=bar" +} + +function test_client_env_using_tools() { + export FOO=startup_foo + bazel clean --expunge + bazel help build > /dev/null || fail "${PRODUCT_NAME} help failed" + export FOO=client_foo + bazel build --host_action_env=FOO pkg:show_host_env_using_tools || \ + fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/tools_env.txt > $TEST_log + expect_log "FOO=client_foo" +} + +function test_redo_host_env_using_tools() { + export FOO=initial_foo + export UNRELATED=some_value + bazel build --host_action_env=FOO pkg:show_host_env_using_tools \ + || fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/tools_env.txt > $TEST_log + expect_log "FOO=initial_foo" + + # If an unrelated value changes, we expect the action not to be executed again + export UNRELATED=some_other_value + bazel build --host_action_env=FOO -s pkg:show_host_env_using_tools 2> $TEST_log \ + || fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + expect_not_log '^SUBCOMMAND.*pkg:show_host_env_using_tools' + + # However, if a used variable changes, we expect the change to be propagated + export FOO=changed_foo + bazel build --host_action_env=FOO -s pkg:show_host_env_using_tools 2> $TEST_log \ + || fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + expect_log '^SUBCOMMAND.*pkg:show_host_env_using_tools' + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/tools_env.txt > $TEST_log + expect_log "FOO=changed_foo" + + # But repeating the build with no further changes, no action should happen + bazel build --host_action_env=FOO -s pkg:show_host_env_using_tools 2> $TEST_log \ + || fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + expect_not_log '^SUBCOMMAND.*pkg:show_host_env_using_tools' +} + +function test_latest_wins_arg_using_tools() { + export FOO=bar + export BAR=baz + bazel build --host_action_env=BAR --host_action_env=FOO --host_action_env=FOO=foo \ + pkg:show_host_env_using_tools || fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/tools_env.txt > $TEST_log + expect_log "FOO=foo" + expect_log "BAR=baz" + expect_not_log "FOO=bar" +} + +function test_latest_wins_env_using_tools() { + export FOO=bar + export BAR=baz + bazel build --host_action_env=BAR --host_action_env=FOO=foo --host_action_env=FOO \ + pkg:show_host_env_using_tools || fail "${PRODUCT_NAME} build show_host_env_using_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/tools_env.txt > $TEST_log + expect_log "FOO=bar" + expect_log "BAR=baz" + expect_not_log "FOO=foo" +} + +function test_host_env_using_exec_tools_simple() { + export FOO=baz + + # If FOO is passed using --host_action_env, it should be listed in host env vars + bazel build --host_action_env=FOO=bar pkg:show_host_env_using_exec_tools \ + || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/exec_tools_env.txt > $TEST_log + expect_log "FOO=bar" + + # But if FOO is passed using --action_env, it should not be listed in host env vars + bazel build --action_env=FOO=bar pkg:show_host_env_using_exec_tools \ + || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/exec_tools_env.txt > $TEST_log + expect_not_log "FOO=bar" +} + +function test_host_env_using_exec_tools_latest_wins() { + export FOO=environmentfoo + export BAR=environmentbar + bazel build --host_action_env=FOO=foo \ + --host_action_env=BAR=willbeoverridden --host_action_env=BAR=bar pkg:show_host_env_using_exec_tools \ + || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/exec_tools_env.txt > $TEST_log + expect_log "FOO=foo" + expect_log "BAR=bar" +} + +function test_client_env_using_exec_tools() { + export FOO=startup_foo + bazel clean --expunge + bazel help build > /dev/null || fail "${PRODUCT_NAME} help failed" + export FOO=client_foo + bazel build --host_action_env=FOO pkg:show_host_env_using_exec_tools || \ + fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/exec_tools_env.txt > $TEST_log + expect_log "FOO=client_foo" +} + +function test_redo_host_env_using_exec_tools() { + export FOO=initial_foo + export UNRELATED=some_value + bazel build --host_action_env=FOO pkg:show_host_env_using_exec_tools \ + || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/exec_tools_env.txt > $TEST_log + expect_log "FOO=initial_foo" + + # If an unrelated value changes, we expect the action not to be executed again + export UNRELATED=some_other_value + bazel build --host_action_env=FOO -s pkg:show_host_env_using_exec_tools 2> $TEST_log \ + || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + expect_not_log '^SUBCOMMAND.*pkg:show_host_env_using_exec_tools' + + # However, if a used variable changes, we expect the change to be propagated + export FOO=changed_foo + bazel build --host_action_env=FOO -s pkg:show_host_env_using_exec_tools 2> $TEST_log \ + || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + expect_log '^SUBCOMMAND.*pkg:show_host_env_using_exec_tools' + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/exec_tools_env.txt > $TEST_log + expect_log "FOO=changed_foo" + + # But repeating the build with no further changes, no action should happen + bazel build --host_action_env=FOO -s pkg:show_host_env_using_exec_tools 2> $TEST_log \ + || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + expect_not_log '^SUBCOMMAND.*pkg:show_host_env_using_exec_tools' +} + +function test_latest_wins_arg_using_exec_tools() { + export FOO=bar + export BAR=baz + bazel build --host_action_env=BAR --host_action_env=FOO --host_action_env=FOO=foo \ + pkg:show_host_env_using_exec_tools || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/exec_tools_env.txt > $TEST_log + expect_log "FOO=foo" + expect_log "BAR=baz" + expect_not_log "FOO=bar" +} + +function test_latest_wins_env_using_exec_tools() { + export FOO=bar + export BAR=baz + bazel build --host_action_env=BAR --host_action_env=FOO=foo --host_action_env=FOO \ + pkg:show_host_env_using_exec_tools || fail "${PRODUCT_NAME} build show_host_env_using_exec_tools failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/exec_tools_env.txt > $TEST_log + expect_log "FOO=bar" + expect_log "BAR=baz" + expect_not_log "FOO=foo" +} + +function test_host_env_using_successive_exec_tools_simple() { + export FOO=baz + + bazel build --host_action_env=FOO=bar pkg:show_host_env_using_successive_exec_tools \ + || fail "${PRODUCT_NAME} build show_host_env_using_successive_exec_tool failed" + + cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/successive_exec_tools_env.txt > $TEST_log + expect_log "FOO=bar" + +} + run_suite "Tests for bazel's handling of environment variables in actions" From e36479c1c716b4898edf89b1efccdfff5a15a3c8 Mon Sep 17 00:00:00 2001 From: mai93 Date: Mon, 14 Dec 2020 11:44:14 +0200 Subject: [PATCH 07/12] Return execution configuration without applying any transition --- .../lib/analysis/config/ExecutionTransitionFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index 54c07569fc196d..c0ee7501ae1ae3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,8 +109,9 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null) { - // No execution platform is known, so don't change anything. + if (executionPlatform == null || options.get(CoreOptions.class).isExec) { + // If no execution platform is known or the input already comes from execution configuration, + // don't change anything and return the existing value. return options.underlying(); } return cache.applyTransition( From 4f9240472a7ae0f1094ed2c153173718dc1d4b85 Mon Sep 17 00:00:00 2001 From: mai93 Date: Mon, 14 Dec 2020 13:50:37 +0200 Subject: [PATCH 08/12] Revert "Return execution configuration without applying any transition" This reverts commit aa809e5a3889be41c5dcbc2555b7a469df363fe5. --- .../lib/analysis/config/ExecutionTransitionFactory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index c0ee7501ae1ae3..54c07569fc196d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,9 +109,8 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null || options.get(CoreOptions.class).isExec) { - // If no execution platform is known or the input already comes from execution configuration, - // don't change anything and return the existing value. + if (executionPlatform == null) { + // No execution platform is known, so don't change anything. return options.underlying(); } return cache.applyTransition( From 3c282ada37b109a63f6550d541fe4d56a606e5c9 Mon Sep 17 00:00:00 2001 From: mai93 Date: Mon, 14 Dec 2020 14:15:41 +0200 Subject: [PATCH 09/12] Retry initial commit --- .../lib/analysis/config/ExecutionTransitionFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index 54c07569fc196d..c0ee7501ae1ae3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,8 +109,9 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null) { - // No execution platform is known, so don't change anything. + if (executionPlatform == null || options.get(CoreOptions.class).isExec) { + // If no execution platform is known or the input already comes from execution configuration, + // don't change anything and return the existing value. return options.underlying(); } return cache.applyTransition( From 798890b409106dd2010cee3d2c8874505a68d033 Mon Sep 17 00:00:00 2001 From: mai93 Date: Mon, 14 Dec 2020 17:08:01 +0200 Subject: [PATCH 10/12] Remove java.management from jdeps_modules.golden --- src/jdeps_modules.golden | 1 - 1 file changed, 1 deletion(-) diff --git a/src/jdeps_modules.golden b/src/jdeps_modules.golden index 4584f9d392fdfc..e3f2deeb59f97c 100644 --- a/src/jdeps_modules.golden +++ b/src/jdeps_modules.golden @@ -2,7 +2,6 @@ java.base java.compiler java.instrument java.logging -java.management java.naming java.sql java.xml From 40b804d7681d37c873bf81d93d3bc3026c812f34 Mon Sep 17 00:00:00 2001 From: mai93 Date: Tue, 15 Dec 2020 15:59:04 +0200 Subject: [PATCH 11/12] Pass host_action_env to hostActionEnvironment attribute of host options --- src/jdeps_modules.golden | 1 + .../lib/analysis/config/ExecutionTransitionFactory.java | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jdeps_modules.golden b/src/jdeps_modules.golden index e3f2deeb59f97c..4584f9d392fdfc 100644 --- a/src/jdeps_modules.golden +++ b/src/jdeps_modules.golden @@ -2,6 +2,7 @@ java.base java.compiler java.instrument java.logging +java.management java.naming java.sql java.xml diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index c0ee7501ae1ae3..54c07569fc196d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -109,9 +109,8 @@ public ImmutableSet> requiresOptionFragments() @Override public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) { - if (executionPlatform == null || options.get(CoreOptions.class).isExec) { - // If no execution platform is known or the input already comes from execution configuration, - // don't change anything and return the existing value. + if (executionPlatform == null) { + // No execution platform is known, so don't change anything. return options.underlying(); } return cache.applyTransition( From 0a54610ee4576434a75881c9104e6c8249e8f0c9 Mon Sep 17 00:00:00 2001 From: mai93 Date: Wed, 16 Dec 2020 13:50:51 +0200 Subject: [PATCH 12/12] Remove extra blank line --- src/test/shell/integration/action_env_test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/shell/integration/action_env_test.sh b/src/test/shell/integration/action_env_test.sh index e83bde5a6cff12..b4ad5fd1307b17 100755 --- a/src/test/shell/integration/action_env_test.sh +++ b/src/test/shell/integration/action_env_test.sh @@ -437,7 +437,6 @@ function test_host_env_using_successive_exec_tools_simple() { cat `bazel info ${PRODUCT_NAME}-genfiles`/pkg/successive_exec_tools_env.txt > $TEST_log expect_log "FOO=bar" - } run_suite "Tests for bazel's handling of environment variables in actions"