commit 4b1370055e6013b885c70b08ee9693f917cb38e6
author Ulya Trafimovich <skvadrik@google.com> Tue Jul 04 15:40:10 2023 +0100
committer Ulya Trofimovich <skvadrik@google.com> Thu Jul 06 14:35:30 2023 +0000
tree ec827f45ac06095ad7fd0a927586c896f92b9c7f
parent 5b65e02b1cdce48da11a972ab6d75a7fb5c859bd

Fix ART testing scripts to support checker tests on VM.

Bug: 271573990

Test: run ART test 004-checker-UnsafeTest18 on a Linux ARM64 VM:
  lunch aosp_arm64-userdebug

  export ART_TEST_SSH_USER=ubuntu
  export ART_TEST_SSH_HOST=localhost
  export ART_TEST_SSH_PORT=10001
  export ART_TEST_ON_VM=true

  . art/tools/buildbot-utils.sh
  art/tools/buildbot-build.sh --target

  # Create, boot and configure the VM.
  art/tools/buildbot-vm.sh create
  art/tools/buildbot-vm.sh boot
  art/tools/buildbot-vm.sh setup-ssh  # password: 'ubuntu'

  art/tools/buildbot-cleanup-device.sh
  art/tools/buildbot-setup-device.sh
  art/tools/buildbot-sync.sh

  art/test.py --target -r --ndebug --64 --optimizing \
      004-checker-UnsafeTest18

Change-Id: I0fa317c834db677045854008101d45dac36fd694

test/run-test

diff --git a/test/run-test b/test/run-test
index 9565ebb..e650e02 100755
--- a/test/run-test
+++ b/test/run-test
@@ -1099,8 +1099,8 @@
     if run_checker == "yes":
       if target_mode == "yes":
         if ON_VM:
-          run(f'{SCP_CMD} "{SSH_USER}@${SSH_HOST}:{CHROOT}/{cfg_output_dir}/'
-              f'{cfg_output}"')
+          run(f'{SCP_CMD} "{SSH_USER}@{SSH_HOST}:{CHROOT}/{cfg_output_dir}/'
+              f'{cfg_output}" "{tmp_dir}"')
         else:
           run(f'adb pull "{chroot}/{cfg_output_dir}/{cfg_output}"')
       run(f'"{checker}" -q {checker_args} "{cfg_output}" "{tmp_dir}"',

tools/checker/common/archs.py

diff --git a/tools/checker/common/archs.py b/tools/checker/common/archs.py
index 6781fbf..77babf8 100644
--- a/tools/checker/common/archs.py
+++ b/tools/checker/common/archs.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-archs_list = ["ARM", "ARM64", "X86", "X86_64"]
+archs_list = ["ARM", "ARM64", "RISCV64", "X86", "X86_64"]