Port tests/run-make/libtest-json to tests/ui

Author: Zalathar

src/tools/tidy/src/allowed_run_make_makefiles.txt

@@ -87,7 +87,6 @@ run-make/issue-88756-default-output/Makefile
 run-make/issue-97463-abi-param-passing/Makefile
 run-make/jobserver-error/Makefile
 run-make/libs-through-symlinks/Makefile
-run-make/libtest-json/Makefile
 run-make/libtest-junit/Makefile
 run-make/libtest-padding/Makefile
 run-make/libtest-thread-limit/Makefile

tests/run-make/libtest-json/Makefile

@@ -2,9 +2,12 @@
 { "type": "test", "event": "started", "name": "a" }
 { "type": "test", "name": "a", "event": "ok" }
 { "type": "test", "event": "started", "name": "b" }
-{ "type": "test", "name": "b", "event": "failed", "stdout": "thread 'b' panicked at f.rs:9:5:\nassertion failed: false\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n" }
+{ "type": "test", "name": "b", "event": "failed", "stdout": "thread 'b' panicked at $DIR/format-json.rs:LL:5:
+assertion failed: false
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+" }
 { "type": "test", "event": "started", "name": "c" }
 { "type": "test", "name": "c", "event": "ok" }
 { "type": "test", "event": "started", "name": "d" }
 { "type": "test", "name": "d", "event": "ignored", "message": "msg" }
-{ "type": "suite", "event": "failed", "passed": 2, "failed": 1, "ignored": 1, "measured": 0, "filtered_out": 0, "exec_time": $TIME }
+{ "type": "suite", "event": "failed", "passed": 2, "failed": 1, "ignored": 1, "measured": 0, "filtered_out": 0, "exec_time": "$EXEC_TIME" }

tests/run-make/libtest-json/f.rs

@@ -0,0 +1,39 @@
+//@ edition: 2021
+//@ run-fail
+//@ check-run-results
+//@ check-run-stdout-is-json-lines
+//@ needs-unwind (for #[should_panic])
+// ignore-tidy-linelength
+
+//@ revisions: normal show-output
+//@ compile-flags: --test
+//@ run-flags: --test-threads=1 -Zunstable-options --format=json
+//@ [show-output] run-flags: --show-output
+//@ normalize-stdout-test: "(?<prefix>format-json.rs:)[0-9]+(?<suffix>:[0-9]+)" -> "${prefix}LL${suffix}"
+//@ normalize-stdout-test: "(?<prefix>\"exec_time\": *)[0-9.]+" -> "${prefix}\"$$EXEC_TIME\""
+
+// Check that passing `--format=json` to the test harness produces output that
+// matches the snapshot, and is valid JSON-lines.
+
+#[test]
+fn a() {
+    println!("print from successful test");
+    // Should pass
+}
+
+#[test]
+fn b() {
+    assert!(false);
+}
+
+#[test]
+#[should_panic]
+fn c() {
+    assert!(false);
+}
+
+#[test]
+#[ignore = "msg"]
+fn d() {
+    assert!(false);
+}

tests/run-make/libtest-json/validate_json.py

@@ -1,10 +1,16 @@
 { "type": "suite", "event": "started", "test_count": 4 }
 { "type": "test", "event": "started", "name": "a" }
-{ "type": "test", "name": "a", "event": "ok", "stdout": "print from successful test\n" }
+{ "type": "test", "name": "a", "event": "ok", "stdout": "print from successful test
+" }
 { "type": "test", "event": "started", "name": "b" }
-{ "type": "test", "name": "b", "event": "failed", "stdout": "thread 'b' panicked at f.rs:9:5:\nassertion failed: false\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n" }
+{ "type": "test", "name": "b", "event": "failed", "stdout": "thread 'b' panicked at $DIR/format-json.rs:LL:5:
+assertion failed: false
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+" }
 { "type": "test", "event": "started", "name": "c" }
-{ "type": "test", "name": "c", "event": "ok", "stdout": "thread 'c' panicked at f.rs:15:5:\nassertion failed: false\n" }
+{ "type": "test", "name": "c", "event": "ok", "stdout": "thread 'c' panicked at $DIR/format-json.rs:LL:5:
+assertion failed: false
+" }
 { "type": "test", "event": "started", "name": "d" }
 { "type": "test", "name": "d", "event": "ignored", "message": "msg" }
-{ "type": "suite", "event": "failed", "passed": 2, "failed": 1, "ignored": 1, "measured": 0, "filtered_out": 0, "exec_time": $TIME }
+{ "type": "suite", "event": "failed", "passed": 2, "failed": 1, "ignored": 1, "measured": 0, "filtered_out": 0, "exec_time": "$EXEC_TIME" }