diff options
| author | 2025-01-15 21:06:11 +0000 | |
|---|---|---|
| committer | 2025-01-28 09:58:53 -0800 | |
| commit | 701bd96db052c26b1605066af7f1230b66435638 (patch) | |
| tree | 5af447fb7c9714d74b05266ed0c63e8987176bb1 | |
| parent | 6ddb3569b353857e895684aaa5ee62643eedae78 (diff) | |
Do not always set ART_TEST_CHROOT in testrunner.py.
Necessary to allow executing run tests without a chroot setup, e.g. on
user devices. Also, the documented approach in README.chroot.md is that
the user should set ART_TEST_CHROOT explicitly to enable chroot mode.
Fixes regression from https://r.android.com/2977715.
Test: art/test/testrunner/testrunner.py --target 2279-aconfig-flags
Change-Id: I3deabdf2ef3b807065583fadc4f2c4e847956401
| -rw-r--r-- | test/testrunner/env.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 3aa27938f3..d0380318a3 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -164,4 +164,4 @@ ART_CHROOT_CMD = _env.get('ART_CHROOT_CMD', "unshare --user --map-root-user chro if ART_TEST_ON_VM: ART_TEST_CHROOT = _env.get('ART_TEST_CHROOT', f"/home/{ART_TEST_SSH_USER}/art-test-chroot") else: - ART_TEST_CHROOT = _env.get('ART_TEST_CHROOT', "/data/local/art-test-chroot") + ART_TEST_CHROOT = _env.get('ART_TEST_CHROOT') |