diff options
| author | kmb <kmb@google.com> | 2017-10-21 04:07:24 +0200 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-10-24 12:22:26 -0700 |
| commit | c3dfa2e6492ea1ebec8816a6ca32d53523242a9b (patch) | |
| tree | a50e68e72ffdf4b57cdf66578d311a16da2ece66 /test | |
| parent | 0a338b86e4b55ea53bc86bf987ddf7026503b67d (diff) | |
| download | desugar-c3dfa2e6492ea1ebec8816a6ca32d53523242a9b.tar.gz | |
Exclude Android dependency checking from Bazel's singlejar build.
This should also address https://github.com/bazelbuild/bazel/issues/3903
RELNOTES: None.
PiperOrigin-RevId: 172963663
GitOrigin-RevId: db1426b75d7721554a8b139696b5b4c400a260a5
Change-Id: I4cf813e365609c5f811f421f9133b2497f2c5c72
Diffstat (limited to 'test')
| -rwxr-xr-x | test/java/com/google/devtools/build/android/desugar/desugar_deps_consistency_test.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/java/com/google/devtools/build/android/desugar/desugar_deps_consistency_test.sh b/test/java/com/google/devtools/build/android/desugar/desugar_deps_consistency_test.sh index 99682da..e8e7e23 100755 --- a/test/java/com/google/devtools/build/android/desugar/desugar_deps_consistency_test.sh +++ b/test/java/com/google/devtools/build/android/desugar/desugar_deps_consistency_test.sh @@ -16,15 +16,19 @@ set -eu out="$(mktemp)" -if ! "third_party/bazel/src/tools/singlejar/singlejar" --output "${out}" --check_desugar_deps --sources "$@"; then +if ! "devtools/blaze/singlejar/singlejar" --output "${out}" --check_desugar_deps --sources "$@"; then rm "${out}" case "$0" in *_fail_test) echo "Singlejar failed as expected!"; exit 0;; esac - echo "Singlejar unexpectedly succeeded :(" + echo "Singlejar unexpectedly failed" exit 1 fi +case "$0" in + *_fail_test) rm "${out}"; echo "Singlejar unexpectedly succeeded :("; exit 1;; +esac + if third_party/java/jdk/jar/jar tf "${out}" | grep 'desugar_deps'; then rm "${out}" echo "Singlejar output unexpectedly contains desugaring metadata" |