diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index 043c3418026155..3b5ca84ea51a8a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -108,7 +108,7 @@ public static class StrictActionEnvOptions extends FragmentOptions { @Option( name = "incompatible_strict_action_env", oldName = "experimental_strict_action_env", - defaultValue = "true", + defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = { diff --git a/src/test/shell/bazel/bazel_test_test.sh b/src/test/shell/bazel/bazel_test_test.sh index db4af7c8b9c607..d2db7298874879 100755 --- a/src/test/shell/bazel/bazel_test_test.sh +++ b/src/test/shell/bazel/bazel_test_test.sh @@ -198,11 +198,11 @@ EOF # We don't just use the local PATH, but use the test's PATH, which is more restrictive. PATH=$PATH:$PWD/scripts bazel --nomaster_bazelrc test //testing:t1 -s --run_under=hello \ - --test_output=all >& $TEST_log && fail "Expected failure" + --test_output=all --incompatible_strict_action_env=true >& $TEST_log && fail "Expected failure" # With --action_env=PATH, the local PATH is forwarded to the test. PATH=$PATH:$PWD/scripts bazel test //testing:t1 -s --run_under=hello \ - --test_output=all --action_env=PATH >& $TEST_log || fail "Expected success" + --test_output=all >& $TEST_log || fail "Expected success" expect_log 'hello script!!! testing/t1' # We need to forward the PATH to make it work.