Improve the trap behaviour of the test scripts.

- Using `-E` with `set` means errors within functions and subshells will
  be caught by the `trap` + `ERR` combination.
- Adding `1 2 3 6` to the `trap` means that the scripts will exit
  cleanly if you interrupt them, which is useful when testing them
  locally.

Author: nnethercote

ci/check-benchmarks.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-set -e -x;
+set -eE -x;
 
 bash -c "while true; do sleep 30; echo \$(date) - running ...; done" &
 PING_LOOP_PID=$!
-trap 'kill $PING_LOOP_PID' ERR
+trap 'kill $PING_LOOP_PID' ERR 1 2 3 6
 
 # Install a toolchain.
 RUST_BACKTRACE=1 RUST_LOG=collector_raw_cargo=trace,collector=debug,rust_sysroot=debug \

ci/check-profiling.sh

@@ -3,11 +3,11 @@
 # This script only tests some of the profilers at the moment. More coverage
 # would be nice.
 
-set -e -x;
+set -eE -x;
 
 bash -c "while true; do sleep 30; echo \$(date) - running ...; done" &
 PING_LOOP_PID=$!
-trap 'kill $PING_LOOP_PID' ERR
+trap 'kill $PING_LOOP_PID' ERR 1 2 3 6
 
 # Install a toolchain.
 RUST_BACKTRACE=1 RUST_LOG=collector_raw_cargo=trace,collector=debug,rust_sysroot=debug \