debugging "fail now" on windows

rogpeppe · Jun 19, 2024 · fc47985 · fc47985
1 parent 5556500
commit fc47985
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/testscript/cmd.go b/testscript/cmd.go
@@ -578,6 +578,7 @@ func (ts *TestScript) waitBackgroundOne(bgName string) {
 	}
 	// Note: ignore bg.neg, which only takes effect on the non-specific
 	// wait command.
+	println(ts.file, bg.cmd.ProcessState.Success(), bg.cmd.ProcessState.Exited(), bg.cmd.ProcessState.ExitCode())
 	if bg.cmd.ProcessState.Success() {
 		if bg.neg {
 			ts.Fatalf("unexpected command success")
@@ -634,6 +635,7 @@ func (ts *TestScript) waitBackground(checkStatus bool) {
 		if !checkStatus {
 			continue
 		}
+		println(ts.file, bg.cmd.ProcessState.Success(), bg.cmd.ProcessState.Exited(), bg.cmd.ProcessState.ExitCode())
 		if bg.cmd.ProcessState.Success() {
 			if bg.neg {
 				ts.Fatalf("unexpected command success")

diff --git a/testscript/testdata/interrupt_implicit.txt b/testscript/testdata/interrupt_implicit.txt
@@ -0,0 +1,4 @@
+# Let testscript stop signalcatcher at the end of the testscript.
+
+signalcatcher &
+waitfile catchsignal
diff --git a/testscript/testscript.go b/testscript/testscript.go
@@ -652,6 +652,12 @@ func (ts *TestScript) run() {
 		interruptProcess(bg.cmd.Process)
 	}
 	ts.cmdWait(false, nil)
+	// func() {
+	// 	defer catchFailNow(func() {
+	// 		failed = true
+	// 	})
+	// 	ts.cmdWait(false, nil)
+	// }()
 
 	// If we reached here but we've failed (probably because ContinueOnError
 	// was set), don't wipe the log and print "PASS".