From c8f893b8f1e15b5ab094f3ddee97b59ae88a3fb9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 21 May 2019 16:43:51 +0100 Subject: [PATCH] sg-run-job: support +! for *only* adding things to TESTID Signed-off-by: Ian Jackson --- sg-run-job | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sg-run-job b/sg-run-job index 702ed55..3ca725e 100755 --- a/sg-run-job +++ b/sg-run-job @@ -277,6 +277,10 @@ proc recipe-flag {flagname {def 0}} { # subsequent items in SCRIPT-ARGS are added to the expansion of # /@ in TESTID. (The "+" itself is not added to the arguments # or the testid.) +# +# An argument which is precisely "+!" specifies that the +# subsequent items in SCRIPT-ARGS are to be _only_ added to +# the expansion of /@ in TESTID, until the next "+". proc run-ts {iffail args} { set wantstatus pass @@ -343,7 +347,11 @@ proc spawn-ts {iffail testid args} { set adding [expr {!$adding}] continue } - lappend real_args $arg + if {![string compare +! $arg]} { + set adding -1 + continue + } + if {$adding>=0} { lappend real_args $arg } if {$adding} { lappend testid_args $arg } } -- 2.39.5