more expect refactoring

Anton-4 · Anton-4 · commit 82cc3d3b7511 · 2025-08-01T20:02:45.000+02:00
diff --git a/ci/expect_scripts/bytes-stdin-stdout.exp b/ci/expect_scripts/bytes-stdin-stdout.exp
@@ -22,5 +22,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/command-line-args.exp b/ci/expect_scripts/command-line-args.exp
@@ -22,5 +22,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/command.exp b/ci/expect_scripts/command.exp
@@ -21,4 +21,11 @@ XYZ=ABC
 Yo
 }]
 
-expect_with_diff $expected_output
+expect $expected_output {
+    expect eof {
+        check_exit_and_segfault
+    }
+}
+
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
+exit 1
diff --git a/ci/expect_scripts/env-var.exp b/ci/expect_scripts/env-var.exp
@@ -24,5 +24,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/file-permissions.exp b/ci/expect_scripts/file-permissions.exp
@@ -22,5 +22,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/file-read-write.exp b/ci/expect_scripts/file-read-write.exp
@@ -21,5 +21,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/locale.exp b/ci/expect_scripts/locale.exp
@@ -21,5 +21,5 @@ expect -re $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/path-test.exp b/ci/expect_scripts/path-test.exp
diff --git a/ci/expect_scripts/path.exp b/ci/expect_scripts/path.exp
@@ -23,5 +23,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/print.exp b/ci/expect_scripts/print.exp
@@ -23,5 +23,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/shared-code.exp b/ci/expect_scripts/shared-code.exp
@@ -6,60 +6,6 @@ proc normalize_output {output} {
     return $result
 }
 
-proc show_diff {expected actual} {
-    puts stderr "\n=== DIFF OUTPUT ==="
-    puts stderr "Expected:"
-    puts stderr [repr_string $expected]
-    puts stderr "\nActual:"
-    puts stderr [repr_string $actual]
-    
-    # Line-by-line comparison
-    set exp_lines [split $expected "\r\n"]
-    set act_lines [split $actual "\r\n"]
-    set max_lines [expr {max([llength $exp_lines], [llength $act_lines])}]
-    
-    puts stderr "\nLine-by-line comparison:"
-    for {set i 0} {$i < $max_lines} {incr i} {
-        set exp_line [lindex $exp_lines $i]
-        set act_line [lindex $act_lines $i]
-        
-        if {$exp_line ne $act_line} {
-            puts stderr "Line [expr {$i + 1}] differs:"
-            puts stderr "  Expected: [repr_string $exp_line]"
-            puts stderr "  Actual:   [repr_string $act_line]"
-        }
-    }
-}
-
-proc repr_string {str} {
-    # Show invisible characters
-    regsub -all {\r} $str "\\r" result
-    regsub -all {\n} $result "\\n" result
-    regsub -all {\t} $result "\\t" result
-    return "\"$result\""
-}
-
-proc expect_with_diff {expected_output} {
-    expect {
-        $expected_output {
-            expect eof {
-                check_exit_and_segfault
-            }
-        }
-        eof {
-            show_diff $expected_output $expect_out(buffer)
-            puts stderr "\nExpect script failed: output was different from expected value."
-            exit 1
-        }
-        timeout {
-            puts stderr "\nExpect script failed: timeout waiting for expected output."
-            puts stderr "Partial output received:"
-            puts stderr [repr_string $expect_out(buffer)]
-            exit 1
-        }
-    }
-}
-
 proc check_exit_and_segfault {} {
     set status [wait]
     set exit_code [lindex $status 2]
diff --git a/ci/expect_scripts/sqlite-basic.exp b/ci/expect_scripts/sqlite-basic.exp
@@ -26,5 +26,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/sqlite-everything.exp b/ci/expect_scripts/sqlite-everything.exp
@@ -32,5 +32,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/tcp.exp b/ci/expect_scripts/tcp.exp
@@ -55,5 +55,5 @@ expect $expected_output {
     }
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1
diff --git a/ci/expect_scripts/utc.exp b/ci/expect_scripts/utc.exp
@@ -32,5 +32,5 @@ expect -re $expected_output {
     }         
 }
 
-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
 exit 1

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ expect $expected_output {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
	`25`	+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
`26`	`26`	`exit 1`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ expect $expected_output {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
	`27`	+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
`28`	`28`	`exit 1`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ expect $expected_output {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
	`24`	+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
`25`	`25`	`exit 1`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ expect -re $expected_output {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
	`24`	+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
`25`	`25`	`exit 1`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ expect $expected_output {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		-puts stderr "\nExpect script failed: output was different from expected value. uncomment `exp_internal 1` to debug."
	`26`	+puts stderr "\nExpect script failed: output was not as expected. Diff the output with expected_output in this script. Alternatively, uncomment `exp_internal 1` to debug."
`27`	`27`	`exit 1`