stest: Allow SECNET_STEST_DIVERT_*='i <some stuff>'

Eg,
  SECNET_STEST_DIVERT_inside='i gdb --args'
which causes it to print something like this
  spawn UDP_PRELOAD_DIR=./stest/d-nonnego-oo/s LD_PRELOAD=./stest/udp-preload.so:libgtk3-nocsd.so.0 gdb --args ./secnet -dvnc ./stest/d-nonnego-oo/inside.conf
which is convenient.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/stest/common.tcl b/stest/common.tcl
index a8651d696069483dc732997cc36a02de7c496b38..7ebe9d2babab83b8b00954d46a5a508c896aa019 100644 (file)
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -188,8 +188,9 @@ proc spawn-secnet {location site} {
     }
     if {[info exists env($divertk)]} {
        switch -glob $env($divertk) {
-           i {
-               puts " $argl"
+           i - {i *} {
+               regsub {^i} $env($divertk) {} divert_prefix
+               puts "$divert_prefix $argl"
                puts -nonewline "run ^ command, hit return "
                flush stdout
                gets stdin