commit 1ec83c3d8fdb5b27d7eb2f39fd913266c20f0306
author Jaeheon Yi <jaeheon@google.com> Wed Apr 26 14:56:06 2023 -0700
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 03 05:15:21 2023 +0000
tree ca604084f49514a943bfb56c1a1b66b0643fecd7
parent 772537e4122ac1de80a8cf06a83141b8b72c369e

riscv64: small fixes for gdb workflow

Test: build, sync, run, then GDB

  $ art/tools/buildbot-build.sh --target --installclean
  $ art/tools/buildbot-cleanup-device.sh
  $ art/tools/buildbot-setup-device.sh
  $ art/tools/buildbot-sync.sh
  $ art/test/run-test --chroot $ART_TEST_CHROOT --64 -O --never-clean --no-relocate --no-image 001-HelloWorld
  $ art/tools/buildbot-vm.sh connect
  % unshare --user --map-root-user chroot art-test-chroot
  % cd /data/run-test/test-986090
  % cat run.sh
  % (paste env export commands)
  % gdb --args <paste command>

Change-Id: I4a929ba9dab353507e08ae648558b6282576b498

tools/buildbot-cleanup-device.sh

diff --git a/tools/buildbot-cleanup-device.sh b/tools/buildbot-cleanup-device.sh
index 7fd57b4..45d0d45 100755
--- a/tools/buildbot-cleanup-device.sh
+++ b/tools/buildbot-cleanup-device.sh
@@ -26,6 +26,8 @@
     sudo umount $ART_TEST_CHROOT/dev
     sudo umount $ART_TEST_CHROOT/bin
     sudo umount $ART_TEST_CHROOT/lib
+    sudo umount $ART_TEST_CHROOT/usr/lib
+    sudo umount $ART_TEST_CHROOT/usr/share/gdb
     rm -rf $ART_TEST_CHROOT
   "
   exit 0

tools/buildbot-setup-device.sh

diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh
index 90d680b..90a5010 100755
--- a/tools/buildbot-setup-device.sh
+++ b/tools/buildbot-setup-device.sh
@@ -34,9 +34,7 @@
 
     mkdir $ART_TEST_CHROOT/apex
     mkdir $ART_TEST_CHROOT/bin
-    mkdir $ART_TEST_CHROOT/data
-    mkdir $ART_TEST_CHROOT/data/local
-    mkdir $ART_TEST_CHROOT/data/local/tmp
+    mkdir -p $ART_TEST_CHROOT/data/local/tmp
     mkdir $ART_TEST_CHROOT/dev
     mkdir $ART_TEST_CHROOT/etc
     mkdir $ART_TEST_CHROOT/lib
@@ -45,12 +43,16 @@
     mkdir $ART_TEST_CHROOT/sys
     mkdir $ART_TEST_CHROOT/system
     mkdir $ART_TEST_CHROOT/tmp
+    mkdir -p $ART_TEST_CHROOT/usr/lib
+    mkdir -p $ART_TEST_CHROOT/usr/share/gdb
 
     sudo mount -t proc /proc art-test-chroot/proc
     sudo mount -t sysfs /sys art-test-chroot/sys
     sudo mount --bind /dev art-test-chroot/dev
     sudo mount --bind /bin art-test-chroot/bin
     sudo mount --bind /lib art-test-chroot/lib
+    sudo mount --bind /lib art-test-chroot/usr/lib
+    sudo mount --bind /usr/share/gdb art-test-chroot/usr/share/gdb
     $ART_CHROOT_CMD echo \"Hello from chroot! I am \$(uname -a).\"
   "
   exit 0