Hi,
this patch series starts to parse TAP output generated by our tests when
executing them via Meson. This has the benefit that Meson starts to
understand skipped tests and reports how many subtests have been
executed:
```
$ meson test t002*
ninja: Entering directory `/home/pks/Development/git/build'
1/10 t0024-crlf-archive OK 0.17s 2 subtests passed
2/10 t0022-crlf-rename OK 0.18s 2 subtests passed
3/10 t0029-core-unsetenvvars SKIP 0.15s
4/10 t0023-crlf-am OK 0.18s 2 subtests passed
5/10 t0025-crlf-renormalize OK 0.21s 3 subtests passed
6/10 t0026-eol-config OK 0.25s 5 subtests passed
7/10 t0020-crlf OK 0.81s 36 subtests passed
8/10 t0028-working-tree-encoding OK 0.85s 22 subtests passed
9/10 t0021-conversion OK 3.45s 38 subtests passed
10/10 t0027-auto-crlf OK 26.35s 2600 subtests passed
Ok: 9
Fail: 0
Skipped: 1
```
This new feature is only enabled with Meson 1.8 and newer, which
contains a bugfix that we have upstreamed [1] to make the TAP parser
work in `meson test --interactive` mode.
Despite the changes to Meson itself, this patch series also contains a
couple of fixes for our test suite that caused us to not generate proper
TAP output.
Changes in v2:
- Add a patch to fix an unexpectedly passing test on macOS.
- A couple more fixes for broken TAP output.
- Link to v1: https://lore.kernel.org/r/20250506-pks-meson-tap-v1-0-5aaab2942a4c@xxxxxx
Note that I've rebased the series on top of 845c48a16a7 (The seventeenth
batch, 2025-05-23), mostly so that I get hold of the recent CI changes
for GitLab that make the MSVC+Meson run unconditionally. There was no
conflicts though, so it should be fine to retain the old merge base.
Thanks!
Patrick
[1]: https://github.com/mesonbuild/meson/pull/13980
---
Patrick Steinhardt (6):
t: fix cases where output breaks TAP format
t/test-lib: don't print shell traces to stdout
t/test-lib: fix TAP format for BASH_XTRACEFD warning
t7815: fix unexpectedly passing test on macOS
meson: introduce kwargs variable for tests
meson: parse TAP output generated by our tests
contrib/credential/netrc/meson.build | 2 +-
contrib/subtree/meson.build | 2 +-
meson.build | 12 ++++++++++
t/meson.build | 6 ++---
t/t0000-basic.sh | 35 +++++++++++++++-------------
t/t0050-filesystem.sh | 5 ----
t/t1007-hash-object.sh | 2 +-
t/t3600-rm.sh | 5 ----
t/t4000-diff-format.sh | 2 +-
t/t4041-diff-submodule-option.sh | 4 ++--
t/t4060-diff-submodule-option-diff-format.sh | 2 +-
t/t7401-submodule-summary.sh | 4 ++--
t/t7815-grep-binary.sh | 2 +-
t/t9500-gitweb-standalone-no-errors.sh | 14 +++++------
t/t9822-git-p4-path-encoding.sh | 13 +++++++----
t/t9835-git-p4-metadata-encoding-python2.sh | 4 ++--
t/t9836-git-p4-metadata-encoding-python3.sh | 4 ++--
t/t9903-bash-prompt.sh | 4 ----
t/test-lib.sh | 9 ++++---
19 files changed, 70 insertions(+), 61 deletions(-)
Range-diff versus v1:
1: 8ffeaa53d63 ! 1: 022430e0434 t: fix cases where output breaks TAP format
@@ Commit message
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
+ ## t/t0050-filesystem.sh ##
+@@ t/t0050-filesystem.sh: aumlcdiar=$(printf '\141\314\210')
+
+ if test_have_prereq CASE_INSENSITIVE_FS
+ then
+- say "will test on a case insensitive filesystem"
+ test_case=test_expect_failure
+ else
+ test_case=test_expect_success
+@@ t/t0050-filesystem.sh: fi
+
+ if test_have_prereq UTF8_NFD_TO_NFC
+ then
+- say "will test on a unicode corrupting filesystem"
+ test_unicode=test_expect_failure
+ else
+ test_unicode=test_expect_success
+ fi
+
+-test_have_prereq SYMLINKS ||
+- say "will test on a filesystem lacking symbolic links"
+-
+ if test_have_prereq CASE_INSENSITIVE_FS
+ then
+ test_expect_success "detection of case insensitive filesystem during repo init" '
+
## t/t1007-hash-object.sh ##
@@ t/t1007-hash-object.sh: setup_repo() {
@@ t/t1007-hash-object.sh: setup_repo() {
setup_repo
+ ## t/t3600-rm.sh ##
+@@ t/t3600-rm.sh: test_expect_success 'Initialize test directory' '
+ git commit -m "add normal files"
+ '
+
+-if test_have_prereq !FUNNYNAMES
+-then
+- say 'Your filesystem does not allow tabs in filenames.'
+-fi
+-
+ test_expect_success FUNNYNAMES 'add files with funny names' '
+ touch -- "tab embedded" "newline${LF}embedded" &&
+ git add -- "tab embedded" "newline${LF}embedded" &&
+
+ ## t/t4000-diff-format.sh ##
+@@ t/t4000-diff-format.sh: test_expect_success 'git diff-files -p after editing work tree.' '
+ # that's as far as it comes
+ if [ "$(git config --get core.filemode)" = false ]
+ then
+- say 'filemode disabled on the filesystem'
++ skip_all='filemode disabled on the filesystem'
+ test_done
+ fi
+
+
## t/t4041-diff-submodule-option.sh ##
@@ t/t4041-diff-submodule-option.sh: commit_file () {
git commit "$@" -m "Commit $*" >/dev/null
@@ t/t9500-gitweb-standalone-no-errors.sh: test_expect_success \
cat >>gitweb_config.perl <<-\EOF
our $highlight_bin = "highlight";
$feature{'highlight'}{'override'} = 1;
+
+ ## t/t9822-git-p4-path-encoding.sh ##
+@@ t/t9822-git-p4-path-encoding.sh: test_description='Clone repositories with non ASCII paths'
+ UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
+ ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"
+
+-ISO8859="$(printf "$ISO8859_ESCAPED")" &&
+-echo content123 >"$ISO8859" &&
+-rm "$ISO8859" || {
++test_lazy_prereq FS_ACCEPTS_ISO_8859_1 '
++ ISO8859="$(printf "$ISO8859_ESCAPED")" &&
++ echo content123 >"$ISO8859" 2>/dev/null &&
++ rm "$ISO8859"
++'
++
++if ! test_have_prereq FS_ACCEPTS_ISO_8859_1
++then
+ skip_all="fs does not accept ISO-8859-1 filenames"
+ test_done
+-}
++fi
+
+ test_expect_success 'start p4d' '
+ start_p4d
+
+ ## t/t9835-git-p4-metadata-encoding-python2.sh ##
+@@ t/t9835-git-p4-metadata-encoding-python2.sh: failing, and produces maximally sane output in git.'
+ # These tests are specific to Python 2. Write a custom script that executes
+ # git-p4 directly with the Python 2 interpreter to ensure that we use that
+ # version even if Git was compiled with Python 3.
+-python_target_binary=$(which python2)
++python_target_binary=$(which python2 2>/dev/null)
+ if test -n "$python_target_binary"
+ then
+ mkdir temp_python
+@@ t/t9835-git-p4-metadata-encoding-python2.sh: then
+ fi
+
+ git p4-python2 >err
+-if ! grep 'valid commands' err
++if ! grep -q 'valid commands' err
+ then
+ skip_all="skipping python2 git p4 tests; python2 not available"
+ test_done
+
+ ## t/t9836-git-p4-metadata-encoding-python3.sh ##
+@@ t/t9836-git-p4-metadata-encoding-python3.sh: failing, and produces maximally sane output in git.'
+ # These tests are specific to Python 3. Write a custom script that executes
+ # git-p4 directly with the Python 3 interpreter to ensure that we use that
+ # version even if Git was compiled with Python 2.
+-python_target_binary=$(which python3)
++python_target_binary=$(which python3 2>/dev/null)
+ if test -n "$python_target_binary"
+ then
+ mkdir temp_python
+@@ t/t9836-git-p4-metadata-encoding-python3.sh: then
+ fi
+
+ git p4-python3 >err
+-if ! grep 'valid commands' err
++if ! grep -q 'valid commands' err
+ then
+ skip_all="skipping python3 git p4 tests; python3 not available"
+ test_done
+
+ ## t/t9903-bash-prompt.sh ##
+@@ t/t9903-bash-prompt.sh: test_expect_success 'prompt - unborn branch' '
+ test_cmp expected "$actual"
+ '
+
+-if test_have_prereq !FUNNYNAMES; then
+- say 'Your filesystem does not allow newlines in filenames.'
+-fi
+-
+ test_expect_success FUNNYNAMES 'prompt - with newline in path' '
+ repo_with_newline="repo
+ with
2: 2d6afea4853 = 2: 35e2b7f3a08 t/test-lib: don't print shell traces to stdout
-: ----------- > 3: 996920aa372 t/test-lib: fix TAP format for BASH_XTRACEFD warning
-: ----------- > 4: ae584ae3400 t7815: fix unexpectedly passing test on macOS
3: d2ba541c2f6 = 5: 5cfbf9dde27 meson: introduce kwargs variable for tests
4: 73649d77893 ! 6: d242cde7831 meson: parse TAP output generated by our tests
@@ Commit message
Skipped: 1
```
+ Note that when running `meson test --interactive` the test results will
+ now be marked as "ignored". This is because in interactive mode the file
+ descriptors will remain connected to the user's terminal, and it is
+ expected that the user interacts with the tests (e.g., spawn a debugger
+ or use `test_pause`). As such, the TAP output cannot be parsed reliably
+ by Meson in that case, so the tests are marked as ignored accordingly.
+
[1]: https://github.com/mesonbuild/meson/pull/13980
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
---
base-commit: 845c48a16a7f7b2c44d8cb137b16a4a1f0140229
change-id: 20250429-pks-meson-tap-1eed604a02a3
