From 0319952da29b7b6504b7af800c1ee8b22c9dd6da Mon Sep 17 00:00:00 2001 From: Bob Friesenhahn Date: Sun, 21 Jun 2015 19:32:32 +0000 Subject: [PATCH] * test/Makefile.am: tiff2rgba-quad-tile.jpg.sh depends on the JPEG library so only execute if JPEG is available. --- ChangeLog | 3 +++ test/Makefile.am | 4 +++- test/Makefile.in | 57 ++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29df3eac..c7ffe40e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-06-21 Bob Friesenhahn + * test/Makefile.am: tiff2rgba-quad-tile.jpg.sh depends on the JPEG + library so only execute if JPEG is available. + * libtiff 4.0.4 released. * configure.ac: Add a HAVE_FOO Automake conditional for each diff --git a/test/Makefile.am b/test/Makefile.am index 7936667b..ee18045e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -49,8 +49,10 @@ CLEANFILES = test_packbits.tif o-* if HAVE_JPEG JPEG_DEPENDENT_CHECK_PROG=raw_decode +JPEG_DEPENDENT_TESTSCRIPTS=tiff2rgba-quad-tile.jpg.sh else JPEG_DEPENDENT_CHECK_PROG= +JPEG_DEPENDENT_TESTSCRIPTS= endif # Executable programs which need to be built in order to support tests @@ -133,7 +135,7 @@ TESTSCRIPTS = \ tiff2rgba-palette-1c-8b.sh \ tiff2rgba-rgb-3c-16b.sh \ tiff2rgba-rgb-3c-8b.sh \ - tiff2rgba-quad-tile.jpg.sh + $(JPEG_DEPENDENT_TESTSCRIPTS) # This list should contain all of the TIFF files in the 'images' # subdirectory which are intended to be used as input images for diff --git a/test/Makefile.in b/test/Makefile.in index 39af0bfd..d2abbad1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -113,6 +113,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +TESTS = $(check_PROGRAMS) $(am__EXEEXT_3) XFAIL_TESTS = check_PROGRAMS = ascii_tag$(EXEEXT) long_tag$(EXEEXT) \ short_tag$(EXEEXT) strip_rw$(EXEEXT) rewrite$(EXEEXT) \ @@ -408,6 +409,55 @@ am__set_TESTS_bases = \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck +@HAVE_JPEG_TRUE@am__EXEEXT_2 = tiff2rgba-quad-tile.jpg.sh +am__EXEEXT_3 = bmp2tiff_palette.sh bmp2tiff_rgb.sh gif2tiff.sh \ + ppm2tiff_pbm.sh ppm2tiff_pgm.sh ppm2tiff_ppm.sh tiffcp-g3.sh \ + tiffcp-g3-1d.sh tiffcp-g3-1d-fill.sh tiffcp-g3-2d.sh \ + tiffcp-g3-2d-fill.sh tiffcp-g4.sh tiffcp-logluv.sh \ + tiffcp-thumbnail.sh tiffdump.sh tiffinfo.sh tiffcp-split.sh \ + tiffcp-split-join.sh tiff2ps-PS1.sh tiff2ps-PS2.sh \ + tiff2ps-PS3.sh tiff2ps-EPS1.sh tiff2pdf.sh \ + tiffcrop-doubleflip-logluv-3c-16b.sh \ + tiffcrop-doubleflip-minisblack-1c-16b.sh \ + tiffcrop-doubleflip-minisblack-1c-8b.sh \ + tiffcrop-doubleflip-minisblack-2c-8b-alpha.sh \ + tiffcrop-doubleflip-miniswhite-1c-1b.sh \ + tiffcrop-doubleflip-palette-1c-1b.sh \ + tiffcrop-doubleflip-palette-1c-4b.sh \ + tiffcrop-doubleflip-palette-1c-8b.sh \ + tiffcrop-doubleflip-rgb-3c-16b.sh \ + tiffcrop-doubleflip-rgb-3c-8b.sh \ + tiffcrop-extract-logluv-3c-16b.sh \ + tiffcrop-extract-minisblack-1c-16b.sh \ + tiffcrop-extract-minisblack-1c-8b.sh \ + tiffcrop-extract-minisblack-2c-8b-alpha.sh \ + tiffcrop-extract-miniswhite-1c-1b.sh \ + tiffcrop-extract-palette-1c-1b.sh \ + tiffcrop-extract-palette-1c-4b.sh \ + tiffcrop-extract-palette-1c-8b.sh \ + tiffcrop-extract-rgb-3c-16b.sh tiffcrop-extract-rgb-3c-8b.sh \ + tiffcrop-extractz14-logluv-3c-16b.sh \ + tiffcrop-extractz14-minisblack-1c-16b.sh \ + tiffcrop-extractz14-minisblack-1c-8b.sh \ + tiffcrop-extractz14-minisblack-2c-8b-alpha.sh \ + tiffcrop-extractz14-miniswhite-1c-1b.sh \ + tiffcrop-extractz14-palette-1c-1b.sh \ + tiffcrop-extractz14-palette-1c-4b.sh \ + tiffcrop-extractz14-palette-1c-8b.sh \ + tiffcrop-extractz14-rgb-3c-16b.sh \ + tiffcrop-extractz14-rgb-3c-8b.sh tiffcrop-R90-logluv-3c-16b.sh \ + tiffcrop-R90-minisblack-1c-16b.sh \ + tiffcrop-R90-minisblack-1c-8b.sh \ + tiffcrop-R90-minisblack-2c-8b-alpha.sh \ + tiffcrop-R90-miniswhite-1c-1b.sh tiffcrop-R90-palette-1c-1b.sh \ + tiffcrop-R90-palette-1c-4b.sh tiffcrop-R90-palette-1c-8b.sh \ + tiffcrop-R90-rgb-3c-16b.sh tiffcrop-R90-rgb-3c-8b.sh \ + tiff2rgba-logluv-3c-16b.sh tiff2rgba-minisblack-1c-16b.sh \ + tiff2rgba-minisblack-1c-8b.sh \ + tiff2rgba-minisblack-2c-8b-alpha.sh \ + tiff2rgba-miniswhite-1c-1b.sh tiff2rgba-palette-1c-1b.sh \ + tiff2rgba-palette-1c-4b.sh tiff2rgba-palette-1c-8b.sh \ + tiff2rgba-rgb-3c-16b.sh tiff2rgba-rgb-3c-8b.sh $(am__EXEEXT_2) TEST_SUITE_LOG = test-suite.log TEST_EXTENSIONS = @EXEEXT@ .test LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver @@ -593,13 +643,12 @@ EXTRA_DIST = \ common.sh -# All of the tests to execute via 'make check' -TESTS = $(check_PROGRAMS) $(TESTSCRIPTS) - # Extra files which should be cleaned by 'make clean' CLEANFILES = test_packbits.tif o-* @HAVE_JPEG_FALSE@JPEG_DEPENDENT_CHECK_PROG = @HAVE_JPEG_TRUE@JPEG_DEPENDENT_CHECK_PROG = raw_decode +@HAVE_JPEG_FALSE@JPEG_DEPENDENT_TESTSCRIPTS = +@HAVE_JPEG_TRUE@JPEG_DEPENDENT_TESTSCRIPTS = tiff2rgba-quad-tile.jpg.sh # Test scripts to execute TESTSCRIPTS = \ @@ -676,7 +725,7 @@ TESTSCRIPTS = \ tiff2rgba-palette-1c-8b.sh \ tiff2rgba-rgb-3c-16b.sh \ tiff2rgba-rgb-3c-8b.sh \ - tiff2rgba-quad-tile.jpg.sh + $(JPEG_DEPENDENT_TESTSCRIPTS) # This list should contain all of the TIFF files in the 'images'