commit c23a997dd98bdaf5730044e3f73a921d160cf4b1
author Yue Gan <yueg@google.com> Thu Oct 06 12:02:25 2016 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Oct 07 08:04:01 2016 +0000
tree 2bab87bd553f8003157d7cbe798aef94548b04a1
parent 0b66bb505b30716e17d9dc838351b14108c21751

Fix test when run streamed and not sandboxed. (java_import rule conflicts)

--
MOS_MIGRATED_REVID=135345929

src/test/shell/bazel/test-setup.sh

diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index 8d6d668..b615227 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -106,7 +106,8 @@
 
 function setup_javatest_support() {
   setup_javatest_common
-  cat <<EOF >>third_party/BUILD
+  grep -q 'name = "junit4"' third_party/BUILD \
+    || cat <<EOF >>third_party/BUILD
 java_import(
     name = "junit4",
     jars = [
@@ -119,7 +120,8 @@
 
 function setup_skylark_javatest_support() {
   setup_javatest_common
-  cat <<EOF >>third_party/BUILD
+  grep -q "name = \"junit4-jars\"" third_party/BUILD \
+    || cat <<EOF >>third_party/BUILD
 filegroup(
     name = "junit4-jars",
     srcs = [