[devscripts] 01/01: Streamlined structure of test/Makefile

[Nicholas Bamber]

This is an automated email from the git hooks/post-receive script.

periapt pushed a commit to branch master
in repository devscripts.

commit 0809964cb5242539cdea427e6ee30a3df00a4007
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Sun Dec 6 11:58:45 2015 +0000

    Streamlined structure of test/Makefile
---
 debian/changelog |  1 +
 test/Makefile    | 45 +++++++++++++++++++++------------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 576b561..b63dc2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium
   * Added test for life cycle of package:
     + debuild, dscverify, dscextract, list-unreleased, debdiff
   * Rearranged cleanup of tests to use oneTimeSetUp/oneTimeTearDown
+  * Streamlined structure of test/Makefile
 
   [ Dominique Dumont ]
   * licensecheck:
diff --git a/test/Makefile b/test/Makefile
index f3ca3a3..03d2c2c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,29 +1,26 @@
 
-test:
-	./test_annotate-output
-	./test_checkbashisms
-	./test_dd-list
-	./test_debchange
-	./test_package_lifecycle
-	./test_debdiff
-	./test_licensecheck
-	./test_licensecheck_SL 
-	./test_uscan
-	./test_uscan_mangle
-	./test_mk-origtargz
+OUR_TESTS=						\
+	annotate-output				\
+	checkbashisms				\
+	dd-list						\
+	debchange					\
+	package_lifecycle			\
+	debdiff						\
+	licensecheck				\
+	licensecheck_SL				\
+	uscan						\
+	uscan_mangle				\
+	mk-origtargz				
 
-test-installed:
-	./test_annotate-output --installed
-	./test_checkbashisms --installed
-	./test_dd-list --installed
-	./test_debchange --installed
-	./test_package_lifecycle --installed
-	./test_debdiff --installed
-	./test_licensecheck --installed
-	./test_licensecheck_SL --installed 
-	./test_uscan --installed
-	./test_uscan_mangle --installed
-	./test_mk-origtargz --installed
+test: $(foreach i,$(OUR_TESTS),test_$(i).test)
+
+%.test: %
+	./$<
+
+test-installed: $(foreach i,$(OUR_TESTS),test_$(i).test_installed)
+
+%.test_installed: %
+	./$< --installed
 
 online-test:
 	./test_uscan_online

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git