Skip to content

Commit

Permalink
Try to fix new hang
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
0152la committed Nov 29, 2023
1 parent 2e65d86 commit c74891e
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .buildbot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand All @@ -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=(
Expand All @@ -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"

0 comments on commit c74891e

Please sign in to comment.