Rollback of commit 4b73e972d909bcd533f2f9940f95a00b9b73bdde.
*** Reason for rollback ***
Broke tests on CI: http://ci.bazel.io/job/bazel-tests/570/
*** Original change description ***
Roll forward execroot change
RELNOTES[INC]: Previously, an external repository would be symlinked into the
execution root at execroot/local_repo/external/remote_repo. This changes it to
be at execroot/remote_repo. This may break genrules/Skylark actions that
hardcode execution root paths. If this causes breakages for you, ensure that
genrules are using $(location :target) to access files and Skylark rules are
using http://bazel.io/docs/skylark/lib/File.html's path, dirname, etc.
functions. Cust...
--
PiperOrigin-RevId: 147833177
MOS_MIGRATED_REVID=147833177
diff --git a/src/test/shell/integration/java_integration_test.sh b/src/test/shell/integration/java_integration_test.sh
index 907dbf6..e86e90a 100755
--- a/src/test/shell/integration/java_integration_test.sh
+++ b/src/test/shell/integration/java_integration_test.sh
@@ -636,13 +636,6 @@
'--g=$(JAVABASE)',
],
)
-
-genrule(
- name = "javabase",
- srcs = [],
- cmd = "echo $(JAVABASE) > $@",
- outs = ["javabase.out"],
-)
EOF
cat >$pkg/java/com/google/jvmflags/Foo.java <<EOF
@@ -650,9 +643,8 @@
public class Foo { public static void main(String[] args) {} }
EOF
- bazel build //$pkg/java/com/google/jvmflags:all || fail "build failed"
+ bazel build //$pkg/java/com/google/jvmflags:foo || fail "build failed"
- javabase="$(cat ${PRODUCT_NAME}-genfiles/$pkg/java/com/google/jvmflags/javabase.out)"
STUBSCRIPT=${PRODUCT_NAME}-bin/$pkg/java/com/google/jvmflags/foo
[ -e $STUBSCRIPT ] || fail "$STUBSCRIPT not found"
@@ -663,7 +655,7 @@
" --d=\"double_double\" " \
' --e=no_quotes ' \
' --f=stuff$to"escape\\ ' \
- " --g=${javabase}" \
+ " --g=${runfiles_relative_javabase}" \
; do
# NOTE: don't test the full path of the JDK, it's architecture-dependent.
assert_contains $flag $STUBSCRIPT
