From bed16d0bae5da3a439d074c619d8e2a162d2f113 Mon Sep 17 00:00:00 2001 From: Dave Vasilevsky Date: Thu, 9 Nov 2023 11:05:39 -0500 Subject: [PATCH 1/3] fix example dependencies --- README | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README b/README index c6a4007..6f6187e 100644 --- a/README +++ b/README @@ -116,9 +116,10 @@ detailed instructions: For example on Ubuntu 22.04: - $ sudo apt install pkg-config liblzma-dev libfuse3-dev \ - automake autoconf libtool fio \ - zlib1g-dev liblzo2-dev liblzma-dev liblz4-dev libzstd-dev + $ sudo apt install gcc make pkg-config libfuse3-dev \ + zlib1g-dev liblzo2-dev liblzma-dev liblz4-dev libzstd-dev \ + automake autoconf libtool \ + fuse3 fio squashfs-tools $ ./autogen.sh $ ./configure $ make -j4 From 7ddb5087dc373d37c31d8d52cdeb51081cf8845d Mon Sep 17 00:00:00 2001 From: Dave Vasilevsky Date: Thu, 9 Nov 2023 12:40:57 -0500 Subject: [PATCH 2/3] 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 --- .github/workflows/ci.yml | 5 +++++ .gitignore | 1 + Makefile.am | 4 +++- configure.ac | 1 + ...smoke-singlethreaded.sh => ll-smoke-singlethreaded.sh.in} | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) rename tests/{ll-smoke-singlethreaded.sh => ll-smoke-singlethreaded.sh.in} (84%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6023af8..65f071a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,6 +56,11 @@ jobs: make check diff -u ci/expected-features/${CHECK_FEATURES:-all} ci/features if: runner.os != 'macOS' + - name: distcheck + run: | + make distcheck + # This is expensive, run just once + if: matrix.name == 'Ubuntu' - name: test run: | # On macOS loading the macfuse extension is needed. This diff --git a/.gitignore b/.gitignore index 88b1b63..f86d1c1 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ win/Release ci/features tests/lib.sh tests/ll-smoke.sh +tests/ll-smoke-singlethreaded.sh tests/umount-test.sh diff --git a/Makefile.am b/Makefile.am index 61ebf08..48f755f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,7 +126,7 @@ 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 @@ -134,3 +134,5 @@ 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 diff --git a/configure.ac b/configure.ac index a2d9c52..fcb05f1 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) diff --git a/tests/ll-smoke-singlethreaded.sh b/tests/ll-smoke-singlethreaded.sh.in similarity index 84% rename from tests/ll-smoke-singlethreaded.sh rename to tests/ll-smoke-singlethreaded.sh.in index 3fe5bf9..ba88275 100755 --- a/tests/ll-smoke-singlethreaded.sh +++ b/tests/ll-smoke-singlethreaded.sh.in @@ -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 From ebfad3671694d10d2b2df3b69bbfab80b183add5 Mon Sep 17 00:00:00 2001 From: Dave Vasilevsky Date: Thu, 9 Nov 2023 13:05:57 -0500 Subject: [PATCH 3/3] distcheck in its own build --- .github/workflows/ci.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65f071a..f964e82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,8 @@ jobs: os: ubuntu-latest disable_fuse: "--disable-fuse" check_features: demo + - name: distcheck + os: ubuntu-latest - name: Old distro os: ubuntu-20.04 - name: Mac @@ -46,22 +48,20 @@ jobs: brew install autoconf automake libtool pkgconfig squashfs coreutils brew install --cask macfuse if: runner.os == 'macOS' - - name: build + - name: configure run: | ./autogen.sh CPPFLAGS="-Werror" ./configure $DISABLE_FUSE + - name: build + run: | make -j2 V=1 + if: matrix.name != 'distcheck' - name: test run: | make check diff -u ci/expected-features/${CHECK_FEATURES:-all} ci/features - if: runner.os != 'macOS' - - name: distcheck - run: | - make distcheck - # This is expensive, run just once - if: matrix.name == 'Ubuntu' - - name: test + if: runner.os != 'macOS' && matrix.name != 'distcheck' + - name: test mac run: | # On macOS loading the macfuse extension is needed. This # command should load it without rebooting, except System @@ -73,8 +73,13 @@ jobs: diff -u ci/expected-features/${CHECK_FEATURES:-all} ci/features fi if: runner.os == 'macOS' + - name: distcheck + run: | + make distcheck + if: matrix.name == 'distcheck' - name: install run: sudo make install + if: matrix.name != 'distcheck' - name: output run: | cp /tmp/*.log . || true