summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-09-02 21:55:06 +0200
committerJim Meyering <meyering@redhat.com>2012-09-05 08:48:28 +0200
commit995cd3fa66f484964f9b5f75a2991d92f141a8ba (patch)
treef8be3710d3e9071714ccb9dca187b4a45d2c7f22
parent86e69b1b62148d8ea49d2a54be80aa4a0f6b046d (diff)
downloadcoreutils-995cd3fa66f484964f9b5f75a2991d92f141a8ba.tar.xz
maint: make vc_exe_in_TESTS also work in VPATH builds
* tests/Makefile.am (vc_exe_in_TESTS): It is easy to adjust this recipe to also work in VPATH setups, also thanks to modifications done by previous changes.
-rw-r--r--tests/Makefile.am14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bcdaa5f9e..9e47f28eb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,15 +24,15 @@ root_tests = $(all_root_tests)
# Ensure that all version-controlled executable files are listed
# in $(all_tests).
vc_exe_in_TESTS:
- $(AM_V_GEN)if test -d $(top_srcdir)/.git && test $(srcdir) = .; then \
+ $(AM_V_GEN)test -d $(top_srcdir)/.git || exit 1; \
{ \
- for t in $(all_tests); do echo $$t; done; \
- for f in `cd $(top_srcdir) && \
- build-aux/vc-list-files $(subdir) | sed 's!^$(subdir)/!!'`; do \
- test -f "$$f" && test -x "$$f" && echo "$$f"; \
+ for t in $(all_tests); do echo $$t; done; \
+ cd $(top_srcdir); \
+ for f in `$(SHELL) build-aux/vc-list-files $(subdir) \
+ | sed 's!^$(subdir)/!!'`; do \
+ test -f "tests/$$f" && test -x "tests/$$f" && echo "$$f"; \
done; \
- } | sort | uniq -u | grep . && exit 1 ||:; \
- else :; fi
+ } | sort | uniq -u | grep . && exit 1; :
check-local: vc_exe_in_TESTS
.PHONY: vc_exe_in_TESTS