From c74891e68568f9fe387d2bc9c2f690c55a6831b3 Mon Sep 17 00:00:00 2001 From: Andrei Lascu Date: Wed, 29 Nov 2023 12:10:06 +0000 Subject: [PATCH] Try to fix new hang Use `script` to call the CHERI QEMU instances in new subshells, so the `SIGTTY` issue doesn't get propagated to the main shell. Seems to work. --- .buildbot.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.buildbot.sh b/.buildbot.sh index 829bcc9..0318cb7 100755 --- a/.buildbot.sh +++ b/.buildbot.sh @@ -48,7 +48,9 @@ args=( --ssh-port $SSHPORT --ssh-key $HOME/.ssh/id_ed25519.pub ) -BUILDBOT_PLATFORM=riscv64-purecap python3 tests/run_cheri_examples.py "${args[@]}" +export BUILDBOT_PLATFORM=riscv64-purecap +args=${args[@]} +script -O /dev/null -c "python3 tests/run_cheri_examples.py $args" echo "Running tests for 'morello-hybrid' using QEMU..." args=( @@ -62,7 +64,9 @@ args=( --ssh-port $SSHPORT --ssh-key $HOME/.ssh/id_ed25519.pub ) -BUILDBOT_PLATFORM=morello-hybrid python3 tests/run_cheri_examples.py "${args[@]}" +export BUILDBOT_PLATFORM=morello-hybrid +args=${args[@]} +script -O /dev/null -c "python3 tests/run_cheri_examples.py $args" echo "Running tests for 'morello-purecap' using QEMU..." args=( @@ -76,4 +80,6 @@ args=( --ssh-port $SSHPORT --ssh-key $HOME/.ssh/id_ed25519.pub ) -BUILDBOT_PLATFORM=morello-purecap python3 tests/run_cheri_examples.py "${args[@]}" +export BUILDBOT_PLATFORM=morello-purecap +args=${args[@]} +script -O /dev/null -c "python3 tests/run_cheri_examples.py $args"