Provide the expected output of "test-tool example-tap" verbatim instead
of as a here-doc, to avoid distractions due to quoting, variables
containing quotes and indentation.
Signed-off-by: René Scharfe <l.s.r@xxxxxx>
---
t/t0080-unit-test-output.sh | 48 +------------------------------------
t/t0080/expect | 43 +++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 47 deletions(-)
create mode 100644 t/t0080/expect
diff --git a/t/t0080-unit-test-output.sh b/t/t0080-unit-test-output.sh
index 7bbb065d58..93f2defa19 100755
--- a/t/t0080-unit-test-output.sh
+++ b/t/t0080-unit-test-output.sh
@@ -6,54 +6,8 @@ TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'TAP output from unit tests' '
- cat >expect <<-EOF &&
- ok 1 - passing test
- ok 2 - passing test and assertion return 1
- # check "1 == 2" failed at t/helper/test-example-tap.c:77
- # left: 1
- # right: 2
- not ok 3 - failing test
- ok 4 - failing test and assertion return 0
- not ok 5 - passing TEST_TODO() # TODO
- ok 6 - passing TEST_TODO() returns 1
- # todo check ${SQ}check(x)${SQ} succeeded at t/helper/test-example-tap.c:26
- not ok 7 - failing TEST_TODO()
- ok 8 - failing TEST_TODO() returns 0
- # check "0" failed at t/helper/test-example-tap.c:31
- # skipping test - missing prerequisite
- # skipping check ${SQ}1${SQ} at t/helper/test-example-tap.c:33
- ok 9 - test_skip() # SKIP
- ok 10 - skipped test returns 1
- # skipping test - missing prerequisite
- ok 11 - test_skip() inside TEST_TODO() # SKIP
- ok 12 - test_skip() inside TEST_TODO() returns 1
- # check "0" failed at t/helper/test-example-tap.c:49
- not ok 13 - TEST_TODO() after failing check
- ok 14 - TEST_TODO() after failing check returns 0
- # check "0" failed at t/helper/test-example-tap.c:57
- not ok 15 - failing check after TEST_TODO()
- ok 16 - failing check after TEST_TODO() returns 0
- # check "!strcmp("\thello\\\\", "there\"\n")" failed at t/helper/test-example-tap.c:62
- # left: "\011hello\\\\"
- # right: "there\"\012"
- # check "!strcmp("NULL", NULL)" failed at t/helper/test-example-tap.c:63
- # left: "NULL"
- # right: NULL
- # check "${SQ}a${SQ} == ${SQ}\n${SQ}" failed at t/helper/test-example-tap.c:64
- # left: ${SQ}a${SQ}
- # right: ${SQ}\012${SQ}
- # check "${SQ}\\\\${SQ} == ${SQ}\\${SQ}${SQ}" failed at t/helper/test-example-tap.c:65
- # left: ${SQ}\\\\${SQ}
- # right: ${SQ}\\${SQ}${SQ}
- not ok 17 - messages from failing string and char comparison
- # BUG: test has no checks at t/helper/test-example-tap.c:92
- not ok 18 - test with no checks
- ok 19 - test with no checks returns 0
- 1..19
- EOF
-
! test-tool example-tap >actual &&
- test_cmp expect actual
+ test_cmp "$TEST_DIRECTORY"/t0080/expect actual
'
test_done
diff --git a/t/t0080/expect b/t/t0080/expect
new file mode 100644
index 0000000000..0cfa0dc6d8
--- /dev/null
+++ b/t/t0080/expect
@@ -0,0 +1,43 @@
+ok 1 - passing test
+ok 2 - passing test and assertion return 1
+# check "1 == 2" failed at t/helper/test-example-tap.c:77
+# left: 1
+# right: 2
+not ok 3 - failing test
+ok 4 - failing test and assertion return 0
+not ok 5 - passing TEST_TODO() # TODO
+ok 6 - passing TEST_TODO() returns 1
+# todo check 'check(x)' succeeded at t/helper/test-example-tap.c:26
+not ok 7 - failing TEST_TODO()
+ok 8 - failing TEST_TODO() returns 0
+# check "0" failed at t/helper/test-example-tap.c:31
+# skipping test - missing prerequisite
+# skipping check '1' at t/helper/test-example-tap.c:33
+ok 9 - test_skip() # SKIP
+ok 10 - skipped test returns 1
+# skipping test - missing prerequisite
+ok 11 - test_skip() inside TEST_TODO() # SKIP
+ok 12 - test_skip() inside TEST_TODO() returns 1
+# check "0" failed at t/helper/test-example-tap.c:49
+not ok 13 - TEST_TODO() after failing check
+ok 14 - TEST_TODO() after failing check returns 0
+# check "0" failed at t/helper/test-example-tap.c:57
+not ok 15 - failing check after TEST_TODO()
+ok 16 - failing check after TEST_TODO() returns 0
+# check "!strcmp("\thello\\", "there\"\n")" failed at t/helper/test-example-tap.c:62
+# left: "\011hello\\"
+# right: "there\"\012"
+# check "!strcmp("NULL", NULL)" failed at t/helper/test-example-tap.c:63
+# left: "NULL"
+# right: NULL
+# check "'a' == '\n'" failed at t/helper/test-example-tap.c:64
+# left: 'a'
+# right: '\012'
+# check "'\\' == '\''" failed at t/helper/test-example-tap.c:65
+# left: '\\'
+# right: '\''
+not ok 17 - messages from failing string and char comparison
+# BUG: test has no checks at t/helper/test-example-tap.c:92
+not ok 18 - test with no checks
+ok 19 - test with no checks returns 0
+1..19
--
2.45.2
