Skip to content

Fix TAP output #2320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pks-gitlab wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix TAP output #2320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e4a45d7
t: fix broken TAP output
pks-t Jun 1, 2026
3c40f10
gitlab-ci: rearrange Linux jobs to match GitHub's order
pks-t Jun 4, 2026
549008d
gitlab-ci: add missing Linux jobs
pks-t Jun 4, 2026
6b02e4a
ci: unify Linux images across GitLab and GitHub
pks-t Jun 4, 2026
098bb16
t7527: fix broken TAP output
pks-t Jun 1, 2026
11816c3
t7810: turn MB_REGEX check into a lazy prereq
pks-t Jun 4, 2026
de6645f
t/test-lib: silence EBUSY errors on Windows during test cleanup
pks-t Jun 1, 2026
ec5688b
t/lib-git-p4: silence output when killing p4d and its watchdog
pks-t Jun 1, 2026
012c89b
t: let prove fail when parsing invalid TAP output
pks-t Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ jobs:
image: alpine:latest
# Supported until 2025-04-02.
- jobname: linux32
image: i386/ubuntu:focal
image: i386/ubuntu:20.04
# A RHEL 8 compatible distro. Supported until 2029-05-31.
- jobname: almalinux-8
image: almalinux:8
Expand Down
23 changes: 15 additions & 8 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ test:linux:
- jobname: linux-reftable
image: ubuntu:rolling
CC: clang
- jobname: linux-breaking-changes
image: ubuntu:20.04
CC: gcc
- jobname: fedora-breaking-changes-meson
image: fedora:latest
- jobname: linux-TEST-vars
image: ubuntu:20.04
CC: gcc
CC_PACKAGE: gcc-8
- jobname: linux-breaking-changes
image: ubuntu:rolling
CC: gcc
- jobname: fedora-breaking-changes-meson
image: fedora:latest
- jobname: linux-leaks
image: ubuntu:rolling
CC: gcc
Expand All @@ -60,13 +60,20 @@ test:linux:
- jobname: linux-asan-ubsan
image: ubuntu:rolling
CC: clang
- jobname: linux-meson
image: ubuntu:rolling
CC: gcc
- jobname: linux-musl-meson
image: alpine:latest
# Supported until 2025-04-02.
- jobname: linux32
image: i386/ubuntu:20.04
- jobname: linux-meson
image: ubuntu:rolling
CC: gcc
# A RHEL 8 compatible distro. Supported until 2029-05-31.
- jobname: almalinux-8
image: almalinux:8
# Supported until 2026-08-31.
- jobname: debian-11
image: debian:11
artifacts:
paths:
- t/failed-test-artifacts
Expand Down
2 changes: 1 addition & 1 deletion ci/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ then
CI_OS_NAME=osx
JOBS=$(nproc)
;;
*,alpine:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*)
*,almalinux:*|*,alpine:*|*,debian:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*)
CI_OS_NAME=linux
JOBS=$(nproc)
;;
Expand Down
4 changes: 2 additions & 2 deletions t/lib-git-p4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ pidfile="$TRASH_DIRECTORY/p4d.pid"

stop_p4d_and_watchdog () {
kill -9 $p4d_pid $watchdog_pid
wait $p4d_pid $watchdog_pid 2>/dev/null
}

# git p4 submit generates a temp file, which will
Expand Down Expand Up @@ -174,8 +175,7 @@ retry_until_success () {
}

stop_and_cleanup_p4d () {
kill -9 $p4d_pid $watchdog_pid
wait $p4d_pid
stop_p4d_and_watchdog
rm -rf "$db" "$cli" "$pidfile"
}

Expand Down
7 changes: 4 additions & 3 deletions t/t7527-builtin-fsmonitor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ maybe_timeout () {
"$@"
fi
}
verify_fsmonitor_works () {

test_lazy_prereq FSMONITOR_WORKS '
git init test_fsmonitor_smoke || return 1

GIT_TRACE_FSMONITOR="$PWD/smoke.trace" &&
Expand All @@ -50,9 +51,9 @@ verify_fsmonitor_works () {
ret=$?
rm -rf test_fsmonitor_smoke smoke.trace
return $ret
}
'

if ! verify_fsmonitor_works
if ! test_have_prereq FSMONITOR_WORKS
then
skip_all="filesystem does not deliver fsmonitor events (container/overlayfs?)"
test_done
Expand Down
5 changes: 3 additions & 2 deletions t/t7810-grep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ test_invalid_grep_expression() {
'
}

LC_ALL=en_US.UTF-8 test-tool regex '^.$' '¿' &&
test_set_prereq MB_REGEX
test_lazy_prereq MB_REGEX '
LC_ALL=en_US.UTF-8 test-tool regex "^.$" "¿"
'

cat >hello.c <<EOF
#include <assert.h>
Expand Down
10 changes: 8 additions & 2 deletions t/test-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,10 +1299,10 @@ test_done () {
error "Tests passed but trash directory already removed before test cleanup; aborting"

cd "$TRASH_DIRECTORY/.." &&
rm -fr "$TRASH_DIRECTORY" || {
rm -fr "$TRASH_DIRECTORY" 2>/dev/null || {
# try again in a bit
sleep 5;
rm -fr "$TRASH_DIRECTORY"
rm -fr "$TRASH_DIRECTORY" 2>/dev/null
} ||
error "Tests passed but test cleanup failed; aborting"
fi
Expand Down Expand Up @@ -1532,6 +1532,12 @@ then
BAIL_OUT 'You need to build test-tool; Run "make t/helper/test-tool" in the source (toplevel) directory'
fi

if test -n "$HARNESS_ACTIVE"
then
say "TAP version 13"
say "pragma +strict"
fi

# Are we running this test at all?
remove_trash=
this_test=${0##*/}
Expand Down
Loading