From 30df7fc06f35fb691e0bb67085e25be1a8d21b04 Mon Sep 17 00:00:00 2001
From: Damien Martin-Guillerez <dmarting@google.com>
Date: Tue, 15 Sep 2015 10:10:23 +0000
Subject: Fixes ijar tests on OSX

Two things were broken:
  - Paths to zip/unzip when in the PATH by latest change
  - md5sum was broken by FreeBSD change

--
MOS_MIGRATED_REVID=103077733
---
 third_party/ijar/test/ijar_test.sh | 14 +++++++-------
 third_party/ijar/test/testenv.sh   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/third_party/ijar/test/ijar_test.sh b/third_party/ijar/test/ijar_test.sh
index 9778469fed..848dbddd53 100755
--- a/third_party/ijar/test/ijar_test.sh
+++ b/third_party/ijar/test/ijar_test.sh
@@ -41,13 +41,13 @@ source ${DIR}/testenv.sh || { echo "testenv.sh not found!" >&2; exit 1; }
 
 
 ## Tools
-# Ensure that javac is absolute
-[[ "$JAVAC" =~ ^/ ]] || JAVAC="$PWD/$JAVAC"
-[[ "$JAR" =~ ^/ ]] || JAR="$PWD/$JAR"
-[[ "$IJAR" =~ ^/ ]] || IJAR="$PWD/$IJAR"
-[[ "$UNZIP" =~ ^/ ]] || UNZIP="$PWD/$UNZIP"
-[[ "$ZIP" =~ ^/ ]] || ZIP="$PWD/$ZIP"
-[[ "$JAVAP" =~ ^/ ]] || JAVAP="$PWD/$JAVAP"
+# Ensure that tooling path is absolute if not in PATH.
+[[ "$JAVAC" =~ ^(/|[^/]+$) ]] || JAVAC="$PWD/$JAVAC"
+[[ "$JAR" =~ ^(/|[^/]+$) ]] || JAR="$PWD/$JAR"
+[[ "$IJAR" =~ ^(/|[^/]+$) ]] || IJAR="$PWD/$IJAR"
+[[ "$UNZIP" =~ ^(/|[^/]+$) ]] || UNZIP="$PWD/$UNZIP"
+[[ "$ZIP" =~ ^(/|[^/]+$) ]] || ZIP="$PWD/$ZIP"
+[[ "$JAVAP" =~ ^(/|[^/]+$) ]] || JAVAP="$PWD/$JAVAP"
 
 IJAR_SRCDIR=$(dirname ${IJAR})
 A_JAR=$TEST_TMPDIR/A.jar
diff --git a/third_party/ijar/test/testenv.sh b/third_party/ijar/test/testenv.sh
index 0cb2c21da8..0e704ad1df 100755
--- a/third_party/ijar/test/testenv.sh
+++ b/third_party/ijar/test/testenv.sh
@@ -29,10 +29,10 @@ if [[ "$PLATFORM" = "linux" ]]; then
   function statfmt() {
     stat -c "%s" $1
   }
-  MD5SUM=/sbin/md5
+  MD5SUM=md5sum
 else
   function statfmt() {
     stat -f "%z" $1
   }
-  MD5SUM=md5sum
+  MD5SUM=/sbin/md5
 fi
-- 
cgit v1.2.3