Skip to content

Commit bfc5ab0

Browse files
committed
fix distcheck
* Include some missing test files in dist (+ some docs) * Make ll-smoke-singlethreaded not get confused by out-of-tree builds * Run distcheck in CI
1 parent bed16d0 commit bfc5ab0

File tree

5 files changed

+11
-2
lines changed

5 files changed

+11
-2
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ jobs:
5656
make check
5757
diff -u ci/expected-features/${CHECK_FEATURES:-all} ci/features
5858
if: runner.os != 'macOS'
59+
- name: distcheck
60+
run: |
61+
make distcheck
62+
# This is expensive, run just once
63+
if: matrix.os == 'ubuntu-latest'
5964
- name: test
6065
run: |
6166
# On macOS loading the macfuse extension is needed. This

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ win/Release
3333
ci/features
3434
tests/lib.sh
3535
tests/ll-smoke.sh
36+
tests/ll-smoke-singlethreaded.sh
3637
tests/umount-test.sh

Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,13 @@ if SQ_DEMO_TESTS
126126
TESTS += tests/ls.sh
127127
endif
128128
tests/ll-smoke.sh tests/ls.sh: tests/lib.sh
129-
129+
EXTRA_DIST += tests/ll-smoke-singlethreaded.sh tests/ls.sh tests/notify_test.sh
130130

131131
# Handle generation of swap include files
132132
CLEANFILES = swap.h.inc swap.c.inc
133133
EXTRA_DIST += swap.h.inc swap.c.inc
134134
$(libsquashfuse_convenience_la_OBJECTS): swap.h.inc
135135
swap.h.inc swap.c.inc: gen_swap.sh squashfs_fs.h Makefile
136136
SED="$(SED)" $(srcdir)/gen_swap.sh $(srcdir)/squashfs_fs.h
137+
138+
EXTRA_DIST += ci/expected-features/all ci/expected-features/demo

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ AS_IF([test "x$sq_tests" = x], [sq_tests=" none"])
9191

9292
AC_SUBST([sq_mksquashfs_compressors])
9393
AC_CONFIG_FILES([tests/ll-smoke.sh],[chmod +x tests/ll-smoke.sh])
94+
AC_CONFIG_FILES([tests/ll-smoke-singlethreaded.sh],[chmod +x tests/ll-smoke-singlethreaded.sh])
9495
AC_CONFIG_FILES([tests/umount-test.sh],[chmod +x tests/umount-test.sh])
9596

9697

tests/ll-smoke-singlethreaded.sh renamed to tests/ll-smoke-singlethreaded.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# the FUSE '-s' commandline option.
88
#
99
# So we just re-run the normal ll-smoke test with the '-s' option.
10-
SFLL_EXTRA_ARGS="-s" $(dirname -- $0)/ll-smoke.sh
10+
SFLL_EXTRA_ARGS="-s" @builddir@/tests/ll-smoke.sh

0 commit comments

Comments
 (0)