diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-12-25 17:36:41 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-12-25 17:36:41 +0000 |
commit | 9df60b4c472359d6d1a92fd62dd74feb002f14fc (patch) | |
tree | 9ea46580cac4aa19cbb07881b98d52200f5b9c36 /GNUmakefile | |
parent | ba0c660b33b95c870f275466af5e6342759e621a (diff) | |
download | netpbm-mirror-9df60b4c472359d6d1a92fd62dd74feb002f14fc.tar.gz netpbm-mirror-9df60b4c472359d6d1a92fd62dd74feb002f14fc.tar.xz netpbm-mirror-9df60b4c472359d6d1a92fd62dd74feb002f14fc.zip |
Copy Development as new Advanced
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2861 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index ddcc882b..4e10e12c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -455,6 +455,21 @@ 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)" \ + PNGLIB="$(PNGLIB)" \ + TIFFLIB="$(TIFFLIB)" \ + URTLIB="$(URTLIB)" \ + X11LIB="$(X11LIB)" \ + XML2_LIBS="$(XML2_LIBS)" \ + ZLIB="$(ZLIB)" + # Test files in source tree. check-tree : BUILDBINDIRS :=./analyzer \ @@ -525,10 +540,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 +560,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 |