Skip to content

Commit fd1abb0

Browse files
committed
Worked on tests and changes for CI tests
1 parent 8879912 commit fd1abb0

5 files changed

Lines changed: 15 additions & 11 deletions

File tree

.github/workflows/build_package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
container:
1414
image: ubuntu:${{ matrix.version }}
1515
steps:
16-
- uses: actions/checkout@v6
1716
- name: Set up container
1817
env:
1918
DEBIAN_FRONTEND: noninteractive
@@ -26,6 +25,7 @@ jobs:
2625
run: |
2726
apt update -q
2827
apt install -y autoconf automake autopoint autotools-dev build-essential debhelper dh-autoreconf dh-python fakeroot git libtool pkg-config
28+
- uses: actions/checkout@v6
2929
- name: Download test data
3030
run: |
3131
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -50,13 +50,13 @@ jobs:
5050
container:
5151
image: registry.fedoraproject.org/fedora:${{ matrix.version }}
5252
steps:
53-
- uses: actions/checkout@v6
5453
- name: Set up container
5554
run: |
5655
dnf install -y dnf-plugins-core langpacks-en
5756
- name: Install build dependencies
5857
run: |
5958
dnf install -y @development-tools autoconf automake gettext-devel git libtool make pkg-config rpm-build
59+
- uses: actions/checkout@v6
6060
- name: Download test data
6161
run: |
6262
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
22

33
AC_INIT(
44
[libcfile],
5-
[20260624],
5+
[20260703],
66
[https://github.com/libyal/libcfile/issues])
77

88
AC_CONFIG_SRCDIR(

dpkg/source/local-options

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
extend-diff-ignore = "(^|/)\.codecov\.yml$"
2+
extend-diff-ignore = "(^|/)\.git($|/)"
23
extend-diff-ignore = "(^|/)\.github/.+$"
34
extend-diff-ignore = "(^|/)[^/]+\.(ini|nuspec|ps1|sh|yaml|yml)$"
45
extend-diff-ignore = "(^|/).+/Makefile.in$"

m4/tests.m4

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Functions for testing
22
dnl
3-
dnl Version: 20260612
3+
dnl Version: 20260702
44

55
dnl Function to check if pthread_rwlock_unlock can be hooked for testing
66
AC_DEFUN([AX_TESTS_CHECK_CAN_HOOK_PTHREAD_RWLOCK_UNLOCK],
@@ -85,24 +85,25 @@ AC_DEFUN([AX_TESTS_CHECK_HAVE_MANPAGE_LINTER],
8585
8686
printf '.Dd June 10, 2026\n.Dt TITLE 1\n.Os\n.Sh NAME\n.Nm command\n.Nd example\n' > conftest.1
8787
88+
# Note that if man cannot set the locale it will exit with 0 but print to stderr
8889
AS_IF(
8990
[test "x$MAN" != x],
90-
[LC_ALL="en_US.UTF-8" MANROFFSEQ="" MANWIDTH="80" "$MAN" --warnings -E UTF-8 -l -Tutf8 -Z conftest.1 >/dev/null 2>&1
91+
[LC_ALL="en_US.UTF-8" MANROFFSEQ="" MANWIDTH="80" "$MAN" --warnings -E UTF-8 -l -Tutf8 -Z conftest.1 >/dev/null 2>conftest.err
9192
AS_IF(
92-
[test $? -eq 0],
93+
[test $? -eq 0 && ! test -s conftest.err],
9394
[ac_cv_have_manpage_linter="man-db"])
9495
])
9596
9697
AS_IF(
9798
[test "x$ac_cv_have_manpage_linter" = xno && test "x$MANDOC" != x],
98-
[LC_ALL="en_US.UTF-8" "$MANDOC" -O width=80 -T lint -W all ./conftest.1 >/dev/null 2>&1
99+
[LC_ALL="en_US.UTF-8" "$MANDOC" -O width=80 -T lint -W all ./conftest.1 >/dev/null 2>conftest.err
99100
100101
AS_IF(
101-
[test $? -eq 0],
102+
[test $? -eq 0 && ! test -s conftest.err],
102103
[ac_cv_have_manpage_linter="mandoc"])
103104
])
104105
105-
rm -f conftest.1
106+
rm -f conftest.1 conftest.err
106107
])
107108
])
108109

@@ -280,6 +281,7 @@ AC_DEFUN([AX_TESTS_CHECK_LOCAL],
280281
281282
dnl Note cannot use GZIP given it has a special purpose within gzip
282283
AC_PATH_PROG(GZIP_COMMAND, [gzip])
284+
AC_PATH_PROGS([MD5SUM], [md5sum md5])
283285
AC_PATH_PROG(ZCAT, [zcat])
284286
285287
AC_SUBST(

tests/Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,12 @@ test_manpages: \
151151
test_manpages.at
152152

153153
EXTRA_DIST = \
154-
$(check_AUTOTESTS:=.at) \
155154
$(input_FILES) \
156155
generate_test_inputs.sh \
157156
package.m4 \
158-
test_macros.at
157+
test_library.at \
158+
test_macros.at \
159+
test_manpages.at
159160

160161
CLEANFILES = \
161162
$(check_AUTOTESTS) \

0 commit comments

Comments
 (0)