diff options
| -rwxr-xr-x | tools/buildbot-cleanup-device.sh | 2 | ||||
| -rwxr-xr-x | tools/buildbot-setup-device.sh | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/buildbot-cleanup-device.sh b/tools/buildbot-cleanup-device.sh index 7fd57b413e..45d0d45bb2 100755 --- a/tools/buildbot-cleanup-device.sh +++ b/tools/buildbot-cleanup-device.sh @@ -26,6 +26,8 @@ if [[ -n "$ART_TEST_ON_VM" ]]; then 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 diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh index 90d680b7d2..90a5010ccb 100755 --- a/tools/buildbot-setup-device.sh +++ b/tools/buildbot-setup-device.sh @@ -34,9 +34,7 @@ if [[ -n "$ART_TEST_ON_VM" ]]; then 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 @@ if [[ -n "$ART_TEST_ON_VM" ]]; then 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 |