Automated rollback of commit 7fcbc8ffdead028d19606fefa2fa3be13781da98.

*** Reason for rollback ***

According to a post-submit regression test, this
commit increased Bazel's memory usage slightly
beyond some threshold. That event prompted me to
consider and question the necessity of this
commit.

My goal is to make Bazel work on Windows without
requiring MSYS, failing the build only if an
action is a shell action. Toolchainifying the
shell is related to, but not required by this
effort. What is required is to fail the build when
Bazel tries to create a shell action but the shell
is missing, and we have that already with
ShToolchain.getPath (which only considers the
ShellConfiguration fragment).

What's missing for my goal is to reimplement
hardcoded shell actions
(i.e. SpawnAction.builder().setShellCommand(...))
without using the shell where possible.

*** Original change description ***

shell toolchain: genrule now uses it

genrule() now uses the shell toolchain (as well as
the ShellConfiguration config fragment) to look up
the shell interpreter's path.

Also the CommandHelper no longer looks up the
shell interpreter's path itself. Instead its ctor
takes the path as an argument. This allows
supporting rules that already use the shell
toolchain and rules that still only consider the
configuration fragment.

With these changes genrule() is now able to use
the shell interpreter registered as a toolchain,
even if there's no `--shell_executable` flag
specified (or its value is empty).

Subsequent commits will migrate more and more
rules to depend on the shell toolchain.

This commit takes us closer to:

1. be able to detect the local shell interpreter's
   location, especially when it's not the default
   /bin/bash

2. be able to define different shell toolchains
   (different interpreter paths) for remote builds

3. gracefully fail the build if the machine has no
   shell installed but the action graph included a
   shell action

See https://github.com/bazelbuild/bazel/issues/4319

Change-Id: I0674c7e2d5917643d87b48b19a1cb43e606ad2f7

Closes #5282.

***

RELNOTES: none
PiperOrigin-RevId: 198527351

1 files changed, 1 insertions, 27 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index d26727a650..af2220d0f6 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -61,8 +61,7 @@ public final class BazelAnalysisMock extends AnalysisMock {
             "local_repository(name = 'com_google_protobuf', path = '/protobuf')",
             "bind(name = 'android/sdk', actual='@bazel_tools//tools/android:sdk')",
             "bind(name = 'tools/python', actual='//tools/python')",
-            "register_toolchains('@bazel_tools//tools/cpp:all')",
-            "register_toolchains('@bazel_tools//tools/sh:toolchain')"));
+            "register_toolchains('@bazel_tools//tools/cpp:all')"));
   }
 
   @Override
@@ -191,31 +190,6 @@ public final class BazelAnalysisMock extends AnalysisMock {
     config.create("/bazel_tools_workspace/objcproto/empty.cc");
     config.create("/bazel_tools_workspace/objcproto/well_known_type.proto");
 
-    config.create(
-        "/bazel_tools_workspace/tools/sh/BUILD",
-        "package(default_visibility = ['//visibility:public'])",
-        "load(':sh_toolchain.bzl', 'sh_toolchain')",
-        "",
-        "toolchain_type(name = 'toolchain_type')",
-        "sh_toolchain(",
-        "    name = 'dummy_toolchain',",
-        "    path = '/mock/shell/toolchain',",
-        ")",
-        "toolchain(",
-        "    name = 'toolchain',",
-        "    toolchain = ':dummy_toolchain',",
-        "    toolchain_type = ':toolchain_type',",
-        ")");
-    config.create(
-        "/bazel_tools_workspace/tools/sh/sh_toolchain.bzl",
-        "def _sh_toolchain_impl(ctx):",
-        "  return [platform_common.ToolchainInfo(path = ctx.attr.path)]",
-        "",
-        "sh_toolchain = rule(",
-        "    attrs = {'path': attr.string()},",
-        "    implementation = _sh_toolchain_impl,",
-        ")");
-
     ccSupport().setup(config);
   }