Handle `--android-tzdata-root` in `test/run-test`.
This was missing from previous CLs and prevented
`test/testrunner/testrunner.py` from passing a custom TZ data root to
ART run-tests (via `test/etc/run-test-jar`).
Test: Set `ART_TEST_ANDROID_TZDATA_ROOT` to "/system/etc/tzdata_module"
and run ART run-tests using `art/test/testrunner/testrunner.py` on
device within the chroot environment.
Bug: b/132169989
Bug: b/121117762
Bug: b/119293618
Change-Id: Ia669af6e6fc6c2c8fa57e557fc3a90065166d1ac
diff --git a/test/run-test b/test/run-test
index a2d180e..11ad2fd 100755
--- a/test/run-test
+++ b/test/run-test
@@ -407,6 +407,15 @@
fi
run_args="${run_args} --android-runtime-root $1"
shift
+ elif [ "x$1" = "x--android-tzdata-root" ]; then
+ shift
+ if [ "x$1" = "x" ]; then
+ echo "$0 missing argument to --android-tzdata-root" 1>&2
+ usage="yes"
+ break
+ fi
+ run_args="${run_args} --android-tzdata-root $1"
+ shift
elif [ "x$1" = "x--update" ]; then
update_mode="yes"
shift
@@ -799,6 +808,9 @@
echo " --android-runtime-root [path]"
echo " The path on target for the Android Runtime root."
echo " (/apex/com.android.runtime by default)."
+ echo " --android-tzdata-root [path]"
+ echo " The path on target for the Android Time Zone Data root."
+ echo " (/apex/com.android.tzdata by default)."
echo " --dex2oat-swap Use a dex2oat swap file."
echo " --instruction-set-features [string]"
echo " Set instruction-set-features for compilation."