commit ff62e1d0edf65d5103dde914db780f9c10371b92
author Androbin <robin.richtsfeld@gmail.com> Wed Nov 29 01:18:05 2017 -0800
committer Copybara-Service <copybara-piper@google.com> Wed Nov 29 01:19:54 2017 -0800
tree 1a27e80d42a85dad4a2dcfca960c6bbf34122b3a
parent 71fc9c673611e733ceaa60837051b5fd6ae47be4

More Shell Cleaning - Part Two

@damienmg Here are a few more changes. (`third_party` only)

Closes #4164.

PiperOrigin-RevId: 177278511

third_party/ijar/test/ijar_test.sh

diff --git a/third_party/ijar/test/ijar_test.sh b/third_party/ijar/test/ijar_test.sh
index 0b9a92f..eacf6e4 100755
--- a/third_party/ijar/test/ijar_test.sh
+++ b/third_party/ijar/test/ijar_test.sh
@@ -41,7 +41,7 @@
 source ${DIR}/testenv.sh || { echo "testenv.sh not found!" >&2; exit 1; }
 
 function cleanup() {
-  rm -fr "$TEST_TMPDIR"/*
+  rm -fr "${TEST_TMPDIR:-sentinel}"/*
 }
 
 trap cleanup EXIT
@@ -235,7 +235,7 @@
 
 
   # Check that compile-time constants in A are still annotated as such in ijar:
-  $JAVAP -classpath $TEST_TMPDIR/classes -c B | grep -sq ldc2_w.*123 ||
+  $JAVAP -classpath $TEST_TMPDIR/classes -c B | grep -sq 'ldc2_w.*123' ||
     fail "ConstantValue not propagated to class B!"