Merge pull request #979 from scop/build/distcheck-fixes

build: distcheck fixes

Author: scop

.github/workflows/ci.yaml

@@ -83,7 +83,7 @@ jobs:
           --env CI=true
           --env DIST=${{matrix.dist}}
           --env BSD=${{matrix.bsd}}
-          --env PYTESTFLAGS=--verbose
+          --env PYTESTFLAGS="--verbose -p no:cacheprovider"
           --env NETWORK=$NETWORK
           ${NETWORK:+--network $NETWORK}
           $(test $DIST = fedoradev && echo --security-opt seccomp=unconfined)

README.md

@@ -34,11 +34,12 @@ you simply don't want to use one, you can install bash completion using the
 standard commands for GNU autotools packages:
 
 ```shell
-autoreconf -i  # if not installing from prepared release tarball
+autoreconf -i      # if not installing from prepared release tarball
 ./configure
-make           # GNU make required
-make check     # optional, requires python3 with pytest >= 3.6, pexpect
-make install   # as root
+make               # GNU make required
+make check         # optional
+make install       # as root
+make installcheck  # optional, requires python3 with pytest >= 3.6, pexpect
 ```
 
 These commands install the completions and helpers, as well as a

test/docker/entrypoint.sh

@@ -18,5 +18,5 @@ autoreconf -i
 make -j
 
 xvfb-run make distcheck \
-    PYTESTFLAGS="${PYTESTFLAGS---verbose --numprocesses=auto --dist=loadfile}"
+    PYTESTFLAGS="${PYTESTFLAGS---verbose -p no:cacheprovider --numprocesses=auto --dist=loadfile}"
 cp -p bash-completion-*.tar.* "$oldpwd/"

test/t/Makefile.am

@@ -707,8 +707,13 @@ all:
 
 PYTEST = @PYTEST@
 
-check-local:
+# Some tests require completions/ symlinks to be in place, which would be a
+# chore to achieve in the build dir with VPATH builds (well not the symlinks,
+# but the "main" files they target), e.g. "make distcheck". Therefore we test
+# the installed tree instead, which isn't a bad idea in the first place.
+installcheck-local:
 	ABS_TOP_BUILDDIR="$(abs_top_builddir)" \
+	BASH_COMPLETION_TEST_BASH_COMPLETION="$(DESTDIR)/$(pkgdatadir)/bash_completion" \
 		$(PYTEST) $(PYTESTFLAGS) $(srcdir)
 
 clean-local:

test/t/conftest.py

@@ -273,8 +273,12 @@ def bash(request) -> pexpect.spawn:
         bash.expect_exact(PS1)
 
         # Load bashrc and bash_completion
+        bash_completion = os.environ.get(
+            "BASH_COMPLETION_TEST_BASH_COMPLETION",
+            "%s/../bash_completion" % testdir,
+        )
         assert_bash_exec(bash, "source '%s/config/bashrc'" % testdir)
-        assert_bash_exec(bash, "source '%s/../bash_completion'" % testdir)
+        assert_bash_exec(bash, "source '%s'" % bash_completion)
 
         # Use command name from marker if set, or grab from test filename
         cmd = None  # type: Optional[str]