diff options
| author | David Srbecky <dsrbecky@google.com> | 2024-02-26 15:10:36 +0000 |
|---|---|---|
| committer | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-26 21:45:47 +0000 |
| commit | 5b2f97b131d2075a12c5c48e3fc56a74a7de3b58 (patch) | |
| tree | 771a0fd01e090bfe0458ebb5526b48e90f796686 | |
| parent | 148894a4519be445789f43c4e27fc0a8e9e72700 (diff) | |
| download | art-5b2f97b131d2075a12c5c48e3fc56a74a7de3b58.tar.gz | |
Qemu: Ensure ART_SSH_CMD is defined when running tests
Bug: 283085397
Test: art/test.py --target -r --ndebug --64 --optimizing 001-Main
Change-Id: Ib6424a483fe826f8b671c36015531b6d88119571
| -rwxr-xr-x | test/run-test | 8 | ||||
| -rw-r--r-- | test/testrunner/env.py | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/test/run-test b/test/run-test index de676a0eaa..95af20cca2 100755 --- a/test/run-test +++ b/test/run-test @@ -114,10 +114,10 @@ if True: checker = f"{progdir}/../tools/checker/checker.py" ON_VM = os.environ.get("ART_TEST_ON_VM") - SSH_USER = os.environ.get("ART_TEST_SSH_USER") - SSH_HOST = os.environ.get("ART_TEST_SSH_HOST") - SSH_PORT = os.environ.get("ART_TEST_SSH_PORT") - SSH_CMD = os.environ.get("ART_SSH_CMD") + SSH_USER = env.ART_TEST_SSH_USER + SSH_HOST = env.ART_TEST_SSH_HOST + SSH_PORT = env.ART_TEST_SSH_PORT + SSH_CMD = env.ART_SSH_CMD SCP_CMD = os.environ.get("ART_SCP_CMD") CHROOT = os.environ.get("ART_TEST_CHROOT") CHROOT_CMD = os.environ.get("ART_CHROOT_CMD") diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 200de4a97d..75d62eb8c2 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -148,4 +148,10 @@ SOONG_OUT_DIR = _get_build_var('SOONG_OUT_DIR') ART_TEST_RUN_ON_ARM_FVP = _getEnvBoolean('ART_TEST_RUN_ON_ARM_FVP', False) ART_TEST_ON_VM = _env.get('ART_TEST_ON_VM') -ART_SSH_CMD = _env.get('ART_SSH_CMD') + +ART_TEST_SSH_PORT = _env.get('ART_TEST_SSH_PORT', 10001) +ART_TEST_SSH_USER = _env.get('ART_TEST_SSH_USER', 'ubuntu') +ART_TEST_SSH_HOST = _env.get('ART_TEST_SSH_HOST', 'localhost') +ART_SSH_CMD = _env.get('ART_SSH_CMD', f"ssh -q -i ~/.ssh/ubuntu -p {ART_TEST_SSH_PORT} " + f"-o StrictHostKeyChecking=no " + f"{ART_TEST_SSH_USER}@{ART_TEST_SSH_HOST}") |