autotools: avoid check_SCRIPTS duplication

The check_SCRIPTS content must be added to EXTRA_DIST, otherwise it will
not be included by make dist and it won't be possible to run make check
successfully.

One solution would be to add $(check_SCRIPTS) to EXTRA_DIST to avoid
duplication and help with long term maintenance. However, $(srcdir) is
not supported in the content of the check_SCRIPTS variable.

A GNU Make variable substitution (patsubst) is used to prepend $(srcdir)
to each script, only when used in the EXTRA_DIST variable.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/src/Makefile.am b/src/Makefile.am
index 3501a7c6b0bc6651465ed68cdea921a0170002da..9bbe667ced019e26e4ab270f962007e969752692 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -164,7 +164,6 @@ EXTRA_DIST += \
        $(srcdir)/.git_version \
        $(srcdir)/ceph-rbdnamer \
        $(srcdir)/test/encoding/readable.sh \
-       $(srcdir)/test/encoding/check-generated.sh \
        $(srcdir)/upstart/ceph-all.conf \
        $(srcdir)/upstart/ceph-mon.conf \
        $(srcdir)/upstart/ceph-mon-all.conf \
@@ -190,7 +189,6 @@ EXTRA_DIST += \
        ceph-crush-location \
        mount.fuse.ceph \
        rbdmap \
-       unittest_bufferlist.sh \
        yasm-wrapper
 
 EXTRA_DIST += \

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 6aabe14f5cf776ee5696ade86119ad2c3e06b440..3669c52c2d0e07b69369acafef4e0756f880cd36 100644 (file)
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -247,16 +247,7 @@ EXTRA_DIST += \
        $(srcdir)/test/mon/mon-test-helpers.sh \
        $(srcdir)/test/osd/osd-test-helpers.sh \
         $(srcdir)/test/coverage.sh \
-        $(srcdir)/test/erasure-code/test-erasure-code.sh \
-        $(srcdir)/test/mon/osd-pool-create.sh \
-        $(srcdir)/test/mon/misc.sh \
-        $(srcdir)/test/mon/osd-crush.sh \
-        $(srcdir)/test/mon/osd-erasure-code-profile.sh \
-        $(srcdir)/test/mon/mkfs.sh \
-        $(srcdir)/test/ceph-disk.sh \
-        $(srcdir)/test/mon/mon-handle-forward.sh \
-        $(srcdir)/test/vstart_wrapped_tests.sh \
-        $(srcdir)/test/pybind/test_ceph_argparse.py
+       $(patsubst %,$(srcdir)/%,$(check_SCRIPTS))
 
 # target to build but not run the unit tests
 unittests:: $(check_PROGRAMS)