packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Distribute test scripts even if we wouldn't run them 

This fixes a "make dist" tarball produced on a minimal system and run on a
non-minimal system. Automake knows that files that are only conditionally
included in dist_whatever_WHATEVER are to be distributed, but it does not
do the same for files that are only conditionally included in EXTRA_DIST,
which is how glib-tap.mk's various variables like dist_test_scripts work.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #557
Approved by: cgwalters
This commit is contained in:
Simon McVittie 2016-10-07 23:09:29 +01:00 committed by Atomic Bot
parent 7091d288f7
commit 4eb55a687d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile-tests.am
View File

@ -94,11 +94,16 @@ dist_test_scripts = \
if BUILDOPT_FUSE
dist_test_scripts += tests/test-rofiles-fuse.sh
else
EXTRA_DIST += tests/test-rofiles-fuse.sh
endif
# This one uses corrupt-repo-ref.js
js_tests = tests/test-corruption.sh
if BUILDOPT_GJS
dist_test_scripts += tests/test-corruption.sh
else
EXTRA_DIST += $(js_tests)
endif
dist_installed_test_data = tests/archive-test.sh \
@ -133,11 +138,16 @@ dist_gpgvinsttest_DATA = $(addprefix tests/gpg-verify-data/, \
gpg.conf lgpl2 lgpl2.sig pubring.gpg secring.gpg trustdb.gpg)
endif
if BUILDOPT_GJS
dist_installed_test_scripts = tests/test-core.js \
js_installed_tests = \
tests/test-core.js \
tests/test-sizes.js \
tests/test-sysroot.js \
$(NULL)
if BUILDOPT_GJS
dist_installed_test_scripts = $(js_installed_tests)
else
EXTRA_DIST += $(js_installed_tests)
endif
test_ltlibraries = libreaddir-rand.la