about summary refs log tree commit diff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-12-30 20:11:56 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-12-30 20:11:56 +0000
commitf7ca56342a50bbe25f7676ebf0fe6e13a2268a50 (patch)
tree01f0c0a272383d24143c5bfdba280c4a9a51aad9 /GNUmakefile
parent3eed9e9d475887146a6b089b09491ea2e33a7f21 (diff)
downloadnetpbm-mirror-f7ca56342a50bbe25f7676ebf0fe6e13a2268a50.tar.gz
netpbm-mirror-f7ca56342a50bbe25f7676ebf0fe6e13a2268a50.tar.xz
netpbm-mirror-f7ca56342a50bbe25f7676ebf0fe6e13a2268a50.zip
Files missing from previous commit of test framework updates
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3098 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile
index e5914648..c2139d2a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -527,8 +527,12 @@ resultdir-backup: FORCE
 	fi; \
 	mkdir -p $(RESULTDIR); \
 
+.PHONY: testdir test
 
-check-tree: $(TESTRANDOM) resultdir-backup
+testdir:
+	$(MAKE) -C test
+
+check-tree: testdir resultdir-backup
 	cd $(RESULTDIR); \
 	  $(CHECK_VARS) \
 	  CHECK_TYPE=tree \
@@ -549,7 +553,7 @@ check-package : RGBDEF ?= $(PKGDIR)/misc/rgb.txt
 check-package : PALMMAPDIR ?= $(PKGDIR)/misc/
 check: check-package
 
-check-package: $(TESTRANDOM) resultdir-backup
+check-package: testdir resultdir-backup
 	cd $(RESULTDIR); \
 	  $(CHECK_VARS) \
 	  CHECK_TYPE=package \
@@ -560,7 +564,7 @@ check-package: $(TESTRANDOM) resultdir-backup
 
 # Check after install
 check-install: PALMMAPDIR ?= ""
-check-install: $(TESTRANDOM) resultdir-backup
+check-install: testdir resultdir-backup
 	cd $(RESULTDIR); \
 	  $(CHECK_VARS) \
 	  CHECK_TYPE=install \