From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Dec 2019 12:56:16 +0000 (+0000)
Subject: stest: Allow SECNET_STEST_DIVERT_*='i <some stuff>'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=d45cd2aec58914b57a750d8bc1c31ff7598bccf1;p=secnet.git

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 a8651d6..7ebe9d2 100644
--- 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