testing: Try to properly abort a test run after CTRL-C

The run is aborted after the current scenario.  Depending on which
command was interrupted it might be necessary to press CTRL-C multiple
times (e.g. if a later command depends on the interrupted one).

This should fix HTML files and get us some proper console output after
the run.

diff --git a/testing/do-tests b/testing/do-tests
index 6548345e1230ca42f94c48fa2c045ca9bd472e45..8330f95ad2f972c3936b0c9d63e55513eabac65b 100755 (executable)
--- a/testing/do-tests
+++ b/testing/do-tests
@@ -182,6 +182,16 @@ echo "strongSwan   : $SWANVERSION"
 echo "Date         : $TESTDATE"
 echo
 
+##############################################################################
+# trap CTRL-C to properly terminate a long run
+#
+
+function abort_tests()
+{
+       echo -n "...aborting..." > /dev/tty
+       aborted=YES
+}
+trap abort_tests INT
 
 ##############################################################################
 # enter specific test directory
@@ -879,6 +889,11 @@ do
            ssh $SSHCONF $HOSTLOGIN 'if [ -f /var/run/charon.pid ]; then rm /var/run/charon.pid; echo "    removed charon.pid on `hostname`"; fi'
        done
 
+       if [ -n "$aborted" ]
+       then
+           break 2
+       fi
+
     done
 
 done