diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-11-27 21:09:09 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-11-27 21:09:09 +0000 |
| commit | 82a14e1f3dde2ec2283b6f841d2c5e6287c06d8c (patch) | |
| tree | 0d571a0c570f987079e1f437788a5cd26878bed9 /GNUmakefile | |
| parent | 379943af220c6666ad3ede29441f9cf808cf9804 (diff) | |
| download | netpbm-mirror-82a14e1f3dde2ec2283b6f841d2c5e6287c06d8c.tar.gz netpbm-mirror-82a14e1f3dde2ec2283b6f841d2c5e6287c06d8c.tar.xz netpbm-mirror-82a14e1f3dde2ec2283b6f841d2c5e6287c06d8c.zip | |
Don't try to test a program that wasn't built
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2838 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index ddcc882b..aac9c0c9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -455,6 +455,17 @@ deb: .PHONY: check-package .PHONY: check-install +# Variables from the make env we pass down to the test scripts. +CHECK_VARS = \ + BUILDDIR=$(BUILDDIR) \ + RGBDEF=$(RGBDEF) \ + BUILD_FIASCO=$(BUILD_FIASCO) \ + JASPERLIB="$(JASPERLIB)" \ + JBIGLIB="$(JBIGLIB)" \ + JPEGLIB="$(JPEGLIB)" \ + TIFFLIB="$(TIFFLIB)" \ + URTLIB="$(URTLIB)" + # Test files in source tree. check-tree : BUILDBINDIRS :=./analyzer \ @@ -525,10 +536,10 @@ resultdir-backup: FORCE check-tree: $(TESTRANDOM) resultdir-backup cd $(RESULTDIR); \ + $(CHECK_VARS) \ CHECK_TYPE=tree \ - PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \ + PBM_TEST_PATH=$(PBM_TEST_PATH) \ LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \ - RGBDEF=$(RGBDEF) \ $(SRCDIR)/test/Execute-Tests 2>&1 # Execute-Tests needs to know BUILDDIR in order to locate testrandom. @@ -545,19 +556,18 @@ check: check-package check-package: $(TESTRANDOM) resultdir-backup cd $(RESULTDIR); \ + $(CHECK_VARS) \ CHECK_TYPE=package \ - PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \ + PBM_TEST_PATH=$(PBM_TEST_PATH) \ LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \ - RGBDEF=$(RGBDEF) \ $(SRCDIR)/test/Execute-Tests 2>&1 # Check after install check-install: $(TESTRANDOM) resultdir-backup cd $(RESULTDIR); \ + $(CHECK_VARS) \ CHECK_TYPE=install \ - BUILDDIR=$(BUILDDIR) \ - RGBDEF=$(RGBDEF) \ $(SRCDIR)/test/Execute-Tests 2>&1 |