Skip to content

Commit

Permalink
fix distcheck
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
vasi committed Nov 9, 2023
1 parent bed16d0 commit db9221a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ jobs:
make check
diff -u ci/expected-features/${CHECK_FEATURES:-all} ci/features
if: runner.os != 'macOS'
- name: test
run: |
make distcheck
# This is expensive, run just once
if: runner.os == 'ubuntu-latest'
- name: test
run: |
# On macOS loading the macfuse extension is needed. This
Expand Down
4 changes: 3 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,13 @@ if SQ_DEMO_TESTS
TESTS += tests/ls.sh
endif
tests/ll-smoke.sh tests/ls.sh: tests/lib.sh

EXTRA_DIST += tests/ll-smoke-singlethreaded.sh tests/ls.sh tests/notify_test.sh

# Handle generation of swap include files
CLEANFILES = swap.h.inc swap.c.inc
EXTRA_DIST += swap.h.inc swap.c.inc
$(libsquashfuse_convenience_la_OBJECTS): swap.h.inc
swap.h.inc swap.c.inc: gen_swap.sh squashfs_fs.h Makefile
SED="$(SED)" $(srcdir)/gen_swap.sh $(srcdir)/squashfs_fs.h

EXTRA_DIST += ci/expected-features/all ci/expected-features/demo
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ AS_IF([test "x$sq_tests" = x], [sq_tests=" none"])

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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
# the FUSE '-s' commandline option.
#
# So we just re-run the normal ll-smoke test with the '-s' option.
SFLL_EXTRA_ARGS="-s" $(dirname -- $0)/ll-smoke.sh
SFLL_EXTRA_ARGS="-s" @builddir@/tests/ll-smoke.sh

0 comments on commit db9221a

Please sign in to comment.