Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 10 deletions

diff --git a/tests/run-make-fulldeps/libtest-json/output-stdout-success.json b/tests/run-make-fulldeps/libtest-json/output-stdout-success.json
deleted file mode 100644
index ec98172eb..000000000
--- a/tests/run-make-fulldeps/libtest-json/output-stdout-success.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{ "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", "event": "started", "name": "b" }
-{ "type": "test", "name": "b", "event": "failed", "stdout": "thread 'b' panicked at 'assertion failed: false', f.rs:9:5\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace\n" }
-{ "type": "test", "event": "started", "name": "c" }
-{ "type": "test", "name": "c", "event": "ok", "stdout": "thread 'c' panicked at 'assertion failed: false', f.rs:15:5\n" }
-{ "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 }