Add an "embedded_scripts" filegroup that can be used to easily get all the necessary tools for integration tests.

--
MOS_MIGRATED_REVID=102564985

2 files changed, 16 insertions, 3 deletions

diff --git a/src/test/java/BUILD b/src/test/java/BUILD
index 0e89213a23..8315e1ccc0 100644
--- a/src/test/java/BUILD
+++ b/src/test/java/BUILD
@@ -1,3 +1,15 @@
+# This should correspond to the list of "EMBEDDED_TOOLS" in TestConstants.java.bazel.
+filegroup(
+    name = "embedded_scripts",
+    testonly = 1,
+    data = [
+        "//src/main/tools:build-runfiles",
+        "//src/main/tools:build_interface_so",
+        "//src/main/tools:namespace-sandbox",
+        "//src/main/tools:process-wrapper",
+    ],
+)
+
 java_library(
     name = "testutil",
     srcs = glob(["com/google/devtools/build/lib/testutil/*.java"]),
@@ -572,6 +584,7 @@ java_test(
     name = "sandbox-tests",
     srcs = glob(["com/google/devtools/build/lib/sandbox/*.java"]),
     args = ["com.google.devtools.build.lib.AllTests"],
+    data = [":embedded_scripts"],
     deps = [
         ":analysis_testutil",
         ":testutil",
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
index 7a91f21620..dfcbfcd358 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
@@ -27,16 +27,16 @@ public class TestConstants {
    * A list of all embedded binaries that go into the regular Bazel binary.
    */
   public static final ImmutableList<String> EMBEDDED_TOOLS = ImmutableList.of(
+      "build_interface_so",
       "build-runfiles",
-      "process-wrapper",
       "namespace-sandbox",
-      "build_interface_so");
+      "process-wrapper");
 
   /**
    * Location in the bazel repo where embedded binaries come from.
    */
   public static final ImmutableList<String> EMBEDDED_SCRIPTS_PATHS = ImmutableList.of(
-      "DOES-NOT-WORK-YET");
+      "src/main/tools");
 
   /**
    * Path within runfiles tree for finding everything else.