testscript: handle the "fail now!" panic in cmdWait

Closes rogpeppe#228
bep · May 13, 2023 · 98bb3d5 · 98bb3d5
1 parent a4f6fab
commit 98bb3d5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/testscript/cmd.go b/testscript/cmd.go
@@ -452,6 +452,11 @@ func (ts *TestScript) cmdUNIX2DOS(neg bool, args []string) {
 
 // Tait waits for background commands to exit, setting stderr and stdout to their result.
 func (ts *TestScript) cmdWait(neg bool, args []string) {
+	defer catchFailNow(func() {
+		// There's been a failure in setup; fail immediately regardless
+		// of the ContinueOnError flag.
+		ts.t.FailNow()
+	})
 	if len(args) > 1 {
 		ts.Fatalf("usage: wait [name]")
 	}