summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peter Collingbourne <pcc@google.com> 2022-03-03 12:17:02 -0800
committer Treehugger Robot <treehugger-gerrit@google.com> 2022-03-04 19:32:55 +0000
commitb2c68b36232edc51cac785204d88819f4ec77ec2 (patch)
tree994a3e371ff40699940cd967d14031bf5b39f88c
parent88967d11258932ab4226ebeea8e7c7630857461d (diff)
Mount /dev/pts inside the chroot.
This is necessary for lldb-server to work. Change-Id: I5bf05fd29cb8b03a6458f9a4e96cd414dd9b4883
-rwxr-xr-xtools/buildbot-setup-device.sh2
-rwxr-xr-xtools/buildbot-teardown-device.sh1
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh
index fc306279ea..608d3f22b1 100755
--- a/tools/buildbot-setup-device.sh
+++ b/tools/buildbot-setup-device.sh
@@ -169,6 +169,8 @@ if [[ -n "$ART_TEST_CHROOT" ]]; then
adb shell mkdir -p "$ART_TEST_CHROOT/dev"
adb shell mount | grep -q "^tmpfs on $ART_TEST_CHROOT/dev type tmpfs " \
|| adb shell mount -o bind /dev "$ART_TEST_CHROOT/dev"
+ adb shell mount | grep -q "^devpts on $ART_TEST_CHROOT/dev/pts type devpts " \
+ || adb shell mount -o bind /dev/pts "$ART_TEST_CHROOT/dev/pts"
# Create /apex directory in chroot.
adb shell mkdir -p "$ART_TEST_CHROOT/apex"
diff --git a/tools/buildbot-teardown-device.sh b/tools/buildbot-teardown-device.sh
index d464e42b8d..927e3c5421 100755
--- a/tools/buildbot-teardown-device.sh
+++ b/tools/buildbot-teardown-device.sh
@@ -95,6 +95,7 @@ if [[ -n "$ART_TEST_CHROOT" ]]; then
adb shell rm -rf "$ART_TEST_CHROOT/apex"
# Remove /dev from chroot.
+ remove_filesystem_from_chroot dev/pts devpts false
remove_filesystem_from_chroot dev tmpfs true
# Remove /sys/kernel/debug from chroot.