diff options
| -rw-r--r-- | GNUmakefile | 22 | ||||
| -rwxr-xr-x | test/all-in-place.test | 38 | ||||
| -rwxr-xr-x | test/fiasco-roundtrip.test | 4 | ||||
| -rwxr-xr-x | test/jbig-roundtrip.test | 3 | ||||
| -rwxr-xr-x | test/tiff-roundtrip.test | 3 | ||||
| -rwxr-xr-x | test/utahrle-roundtrip.test | 3 |
6 files changed, 67 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 diff --git a/test/all-in-place.test b/test/all-in-place.test index e372d373..1a6b30c1 100755 --- a/test/all-in-place.test +++ b/test/all-in-place.test @@ -367,11 +367,49 @@ ordinary_testprogs="\ zeisstopnm \ " +enabled_testprog() { + case $1 in + fiascotopnm|\ + pnmtofiasco) + [ "${BUILD_FIASCO}" = "N" ] && return 1 ;; + + jpeg2ktopam|\ + pamtojpeg2k) + [ "${JASPERLIB}" = "NONE" ] && return 1 ;; + + jbigtopnm|\ + pnmtojbig) + [ "${JBIGLIB}" = "NONE" ] && return 1 ;; + + jpegtopnm|\ + pnmtojpeg|\ + ppmtojpeg) + [ "${JPEGLIB}" = "NONE" ] && return 1 ;; + + pamtotiff|\ + pnmtotiffcmyk|\ + tifftopnm) + [ "${TIFFLIB}" = "NONE" ] && return 1 ;; + + pnmtorle|\ + rletopnm) + [ "${URTLIB}" = "NONE" ] && return 1 ;; + esac + + return 0 +} + # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm # has a slightly different version report format. for i in $ordinary_testprogs do + # Stub out programs that aren't built. + if ! enabled_testprog "$i"; then + echo "$i: ok" + continue + fi + $i --version 2>&1 | \ egrep -v -e fiascotopnm -e \ "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \ diff --git a/test/fiasco-roundtrip.test b/test/fiasco-roundtrip.test index f733c04a..8ba0111a 100755 --- a/test/fiasco-roundtrip.test +++ b/test/fiasco-roundtrip.test @@ -2,6 +2,10 @@ # This script tests: pnmtofiasco fiascotopnm # Also requires: pnmpad +if [ "${BUILD_FIASCO}" = "N" ]; then + exit 80 +fi + # Should print 215556145 102615 pnmpad --black --bottom 1 --left 1 testimg.ppm | \ diff --git a/test/jbig-roundtrip.test b/test/jbig-roundtrip.test index 5e96a001..33800348 100755 --- a/test/jbig-roundtrip.test +++ b/test/jbig-roundtrip.test @@ -2,6 +2,9 @@ # This script tests: pnmtojbig jbigtopnm # Also requires: pamchannel pamtopnm +if [ "${JBIGLIB}" = "NONE" ]; then + exit 80 +fi # Test 1. Should print 2425386270 41 pnmtojbig testgrid.pbm | jbigtopnm | cksum diff --git a/test/tiff-roundtrip.test b/test/tiff-roundtrip.test index a99425fa..bb8a2dc0 100755 --- a/test/tiff-roundtrip.test +++ b/test/tiff-roundtrip.test @@ -2,6 +2,9 @@ # This script tests: pamtotiff tifftopnm # Also requires: +if [ "${TIFFLIB}" = "NONE" ]; then + exit 80 +fi # Failure message ## Second test fails if Netpbm was built without the flate library diff --git a/test/utahrle-roundtrip.test b/test/utahrle-roundtrip.test index 982b72a9..ff959990 100755 --- a/test/utahrle-roundtrip.test +++ b/test/utahrle-roundtrip.test @@ -2,6 +2,9 @@ # This script tests: pnmtorle rletopnm # Also requires: pamchannel pamtopnm +if [ "${URTLIB}" = "NONE" ]; then + exit 80 +fi #Test 1. Should produce 1571496937 33838, cksum of testimg.red pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \ |