From 8a4064e2c0987637b11afcc656478d3113d81618 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Mon, 8 Sep 2014 21:37:39 -0700 Subject: [PATCH] Fix darwin run-test problems Bug: 17428908 Change-Id: Id74a0383fdae6753558e27cd447c1ca349819c91 --- test/etc/host-run-test-jar | 4 +++- test/run-test | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/etc/host-run-test-jar b/test/etc/host-run-test-jar index 2241f8569..96344dd9a 100755 --- a/test/etc/host-run-test-jar +++ b/test/etc/host-run-test-jar @@ -164,7 +164,9 @@ if [ "$RELOCATE" = "y" ]; then # since we are relocating. Get the total size of the /system/framework directory # in 512 byte blocks and set it as the ulimit. This should be more than enough # room. - ulimit -S $(du -c -B512 ${ANDROID_ROOT}/framework | tail -1 | cut -f1) || exit 1 + if [ ! `uname` = "Darwin" ]; then # TODO: Darwin doesn't support "du -B..." + ulimit -S $(du -c -B512 ${ANDROID_ROOT}/framework | tail -1 | cut -f1) || exit 1 + fi else FLAGS="${FLAGS} -Xnorelocate" COMPILER_FLAGS="${COMPILER_FLAGS} --runtime-arg -Xnorelocate --no-include-patch-information" diff --git a/test/run-test b/test/run-test index 02b62b053..5d3cbac2a 100755 --- a/test/run-test +++ b/test/run-test @@ -200,9 +200,9 @@ done # # Cannot use realpath, as it does not exist on Mac. # Cannot us a simple "cd", as the path might not be created yet. -# Use -m option of readlink: canonicalizes, but allows non-existing components. -tmp_dir="`cd $oldwd ; readlink -m $tmp_dir`" - +# Cannot use readlink -m, as it does not exist on Mac. +# Fallback to nuclear option: +tmp_dir="`cd $oldwd ; python -c "import os; print os.path.realpath('$tmp_dir')"`" mkdir -p $tmp_dir if [ "$trace" = "true" ]; then -- 2.11.0