diff options
| -rwxr-xr-x | test/etc/host-run-test-jar | 4 | ||||
| -rwxr-xr-x | 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 448559017b..49aa912232 100755 --- a/test/etc/host-run-test-jar +++ b/test/etc/host-run-test-jar @@ -182,7 +182,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 eed28a56be..b140fbf81b 100755 --- a/test/run-test +++ b/test/run-test @@ -223,10 +223,10 @@ 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. +# Cannot use readlink -m, as it does not exist on Mac. +# Fallback to nuclear option: noncanonical_tmp_dir=$tmp_dir -tmp_dir="`cd $oldwd ; readlink -m $tmp_dir`" - +tmp_dir="`cd $oldwd ; python -c "import os; print os.path.realpath('$tmp_dir')"`" mkdir -p $tmp_dir if [ "$basic_verify" = "true" ]; then |