Skip to content

Commit 369fffc

Browse files
committed
Escape additional JSON special characters in failure output
Signed-off-by: Hanxi Zhang <hanxizh@amazon.com>
1 parent cce5ab3 commit 369fffc

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

tests/instances.tcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,9 @@ proc write_test_failures {} {
539539
set test_file [lindex $entry 1]
540540
set error_msg [lindex $entry 2]
541541

542-
set test_name [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" ""} $test_name]
543-
set test_file [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" ""} $test_file]
544-
set error_msg [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" ""} $error_msg]
542+
set test_name [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" "\\r" "\t" "\\t" "\b" "\\b" "\f" "\\f"} $test_name]
543+
set test_file [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" "\\r" "\t" "\\t" "\b" "\\b" "\f" "\\f"} $test_file]
544+
set error_msg [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" "\\r" "\t" "\\t" "\b" "\\b" "\f" "\\f"} $error_msg]
545545

546546
lappend failures "\{\"test_name\":\"$test_name\",\"test_file\":\"$test_file\",\"status\":\"err\",\"error\":\"$error_msg\"\}"
547547
}

tests/test_helper.tcl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,10 @@ proc write_test_failures {} {
635635
set error_msg $failed
636636
}
637637

638-
set test_name [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" ""} $test_name]
639-
set test_file [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" ""} $test_file]
640-
set error_msg [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" ""} $error_msg]
641-
set status [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" ""} $status]
638+
set test_name [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" "\\r" "\t" "\\t" "\b" "\\b" "\f" "\\f"} $test_name]
639+
set test_file [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" "\\r" "\t" "\\t" "\b" "\\b" "\f" "\\f"} $test_file]
640+
set error_msg [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" "\\r" "\t" "\\t" "\b" "\\b" "\f" "\\f"} $error_msg]
641+
set status [string map {"\\" "\\\\" "\"" "\\\"" "\n" "\\n" "\r" "\\r" "\t" "\\t" "\b" "\\b" "\f" "\\f"} $status]
642642

643643
lappend failures "\{\"test_name\":\"$test_name\",\"test_file\":\"$test_file\",\"status\":\"$status\",\"error\":\"$error_msg\"\}"
644644
}

0 commit comments

Comments
 (0)