commit 0cc6a825b14893d0d23311d7d708087794675e77
author Roland Levillain <rpl@google.com> Fri Jun 28 17:18:16 2019 +0100
committer Roland Levillain <rpl@google.com> Tue Jul 02 11:42:55 2019 +0000
tree 832b60c72d16f65e5988bd9d2eaf27830049baf5
parent 4d71e55eb7616b2f2dc6f39377be72fdfbf01b2a

Set `ANDROID_TZDATA_ROOT` to the TZ Data APEX in `tools/run-gtests.sh`.

Set environment variable `ANDROID_TZDATA_ROOT` to
'/apex/com.android.tzdata' before running gtests on device in the
chroot environment, so that the Time Zone Data APEX is used (instead
of Time Zone Data artifacts installed under
`/system/etc/tzdata_module`).

Note: This environment variable is set by default on devices running
Android Q, but the ART Buildbot uses devices with older Android
releases.

Test: ART chroot-based on-device testing using the master-art branch
Test: ART chroot-based on-device testing using the master branch (with
      `TARGET_FLATTEN_APEX` set to `true` before building).
Bug: 132169989
Bug: 121117762

Change-Id: Idcf4e5f4903649b3871f97967b2bb0e2a2cb1cf5

tools/run-gtests.sh

diff --git a/tools/run-gtests.sh b/tools/run-gtests.sh
index 95234a7..0f98e31 100755
--- a/tools/run-gtests.sh
+++ b/tools/run-gtests.sh
@@ -40,7 +40,7 @@
 
 for i in $all_tests; do
   echo "$i"
-  ${ADB} shell "chroot $ART_TEST_CHROOT env ANDROID_RUNTIME_ROOT='/apex/com.android.runtime' ANDROID_TZDATA_ROOT='/system/etc/tzdata_module' $i" || fail $i
+  ${ADB} shell "chroot $ART_TEST_CHROOT env ANDROID_RUNTIME_ROOT='/apex/com.android.runtime' ANDROID_TZDATA_ROOT='/apex/com.android.tzdata' $i" || fail $i
 done
 
 if [ -n "$failing_tests" ]; then