From 45ca8d3873ffe0059de2bb5597667adb2781f625 Mon Sep 17 00:00:00 2001
From: Brian Silverman <bsilver16384@gmail.com>
Date: Thu, 21 Jan 2016 11:52:07 +0000
Subject: Fix extra_actions with sandboxing.

The ExtraAction code assumed that it didn't need to list the runfiles
of its tools when running locally, but this isn't true with sandboxing.

I don't think fixing this will negatively affect anybody's performance
because they probably don't have any runfiles because they currently
can't use them, unless they're running actions remotely in which case
this change has no effect.

--
Change-Id: Ibeb3db9d31321912a7163d1bce0edf5f6288ea3e
Reviewed-on: https://bazel-review.googlesource.com/#/c/2520/
MOS_MIGRATED_REVID=112670586
---
 src/test/shell/bazel/bazel_rules_test.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/test/shell')

diff --git a/src/test/shell/bazel/bazel_rules_test.sh b/src/test/shell/bazel/bazel_rules_test.sh
index 7f18159997..2547ef57d2 100755
--- a/src/test/shell/bazel/bazel_rules_test.sh
+++ b/src/test/shell/bazel/bazel_rules_test.sh
@@ -63,6 +63,10 @@ function test_extra_action() {
   # a program that parses the proto here.
   cat > mypkg/echoer.sh <<EOF
 #!/bin/bash
+if [[ ! -e \$0.runfiles/mypkg/runfile ]]; then
+  echo "Runfile not found" >&2
+  exit 1
+fi
 echo EXTRA ACTION FILE: \$1
 EOF
   chmod +x mypkg/echoer.sh
@@ -75,6 +79,8 @@ public class Hello {
 }
 EOF
 
+  touch mypkg/runfile
+
   cat > mypkg/BUILD <<EOF
 package(default_visibility = ["//visibility:public"])
 
@@ -93,6 +99,7 @@ action_listener(
 sh_binary(
     name = "echoer",
     srcs = ["echoer.sh"],
+    data = ["runfile"],
 )
 
 java_library(
-- 
cgit v1.2.3