diff options
| author |  Yue Gan <yueg@google.com> | 2016-10-06 12:02:25 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-10-07 08:04:01 +0000 |
| commit | c23a997dd98bdaf5730044e3f73a921d160cf4b1 (patch) | |
| tree | 2bab87bd553f8003157d7cbe798aef94548b04a1 /src | |
| parent | 0b66bb505b30716e17d9dc838351b14108c21751 (diff) | |
Fix test when run streamed and not sandboxed. (java_import rule conflicts)
--
MOS_MIGRATED_REVID=135345929
Diffstat (limited to 'src')
| -rwxr-xr-x | src/test/shell/bazel/test-setup.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh index 8d6d668159..b615227c7f 100755 --- a/src/test/shell/bazel/test-setup.sh +++ b/src/test/shell/bazel/test-setup.sh @@ -106,7 +106,8 @@ EOF 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 @@ EOF 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 = [ |