* test/tiffcp-lzw-compat.sh, test/images/quad-lzw-compat.tiff: new files

to test old-style LZW decompression
* test/common.sh, Makefile.am, CMakeList.txt: updated with above

7 files changed, 30 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index b728357f..4b139085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-07-11  Even Rouault <even.rouault at spatialys.com>
 
+	* test/tiffcp-lzw-compat.sh, test/images/quad-lzw-compat.tiff: new files
+	to test old-style LZW decompression
+	* test/common.sh, Makefile.am, CMakeList.txt: updated with above
+
+2017-07-11  Even Rouault <even.rouault at spatialys.com>
+
 	* refresh autoconf/make stuff with what is on Ubuntu 16.04 (minor changes)
 
 2017-07-11  Even Rouault <even.rouault at spatialys.com>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 731aa806..912be19c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -43,6 +43,7 @@ set(TESTSCRIPTS
     tiffcp-g4.sh
     tiffcp-logluv.sh
     tiffcp-thumbnail.sh
+    tiffcp-lzw-compat.sh
     tiffdump.sh
     tiffinfo.sh
     tiffcp-split.sh
@@ -118,7 +119,8 @@ set(TIFFIMAGES
     images/palette-1c-8b.tiff
     images/rgb-3c-16b.tiff
     images/rgb-3c-8b.tiff
-    images/quad-tile.jpg.tiff)
+    images/quad-tile.jpg.tiff
+    images/quad-lzw-compat.tiff)
 
 set(BMPIMAGES
     images/palette-1c-8b.bmp
@@ -332,6 +334,7 @@ add_convert_test(tiffcp   g31dfill   "-c g3:1d:fill" "images/miniswhite-1c-1b.ti
 add_convert_test(tiffcp   g32d       "-c g3:2d"      "images/miniswhite-1c-1b.tiff" FALSE)
 add_convert_test(tiffcp   g32dfill   "-c g3:2d:fill" "images/miniswhite-1c-1b.tiff" FALSE)
 add_convert_test(tiffcp   g4         "-c g4"         "images/miniswhite-1c-1b.tiff" FALSE)
+add_convert_test(tiffcp   none       "-c none"       "images/quad-lzw-compat.tiff" FALSE)
 add_convert_test_multi(tiffcp tiffcp "" logluv "-c none" "-c sgilog" ""
                        "images/logluv-3c-16b.tiff"    FALSE)
 add_convert_test_multi(tiffcp thumbnail "" thumbnail "g3:1d" "" ""
diff --git a/test/Makefile.am b/test/Makefile.am
index 0aca56fc..0b9ff622 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -66,9 +66,6 @@ check_PROGRAMS = \
 
 # Test scripts to execute
 TESTSCRIPTS = \
-	bmp2tiff_palette.sh \
-	bmp2tiff_rgb.sh \
-	gif2tiff.sh \
 	ppm2tiff_pbm.sh \
 	ppm2tiff_pgm.sh \
 	ppm2tiff_ppm.sh \
@@ -80,6 +77,7 @@ TESTSCRIPTS = \
 	tiffcp-g4.sh \
 	tiffcp-logluv.sh \
 	tiffcp-thumbnail.sh \
+	tiffcp-lzw-compat.sh \
 	tiffdump.sh \
 	tiffinfo.sh \
 	tiffcp-split.sh \
@@ -157,13 +155,6 @@ TIFFIMAGES = \
 	images/rgb-3c-8b.tiff \
 	images/quad-tile.jpg.tiff
 
-BMPIMAGES = \
-	images/palette-1c-8b.bmp \
-	images/rgb-3c-8b.bmp
-
-GIFIMAGES = \
-	images/palette-1c-8b.gif
-
 PNMIMAGES = \
 	images/minisblack-1c-8b.pgm \
 	images/miniswhite-1c-1b.pbm \
@@ -174,8 +165,6 @@ PNMIMAGES = \
 # files which are not currently used by the tests.
 IMAGES_EXTRA_DIST = \
 	images/README.txt \
-	$(BMPIMAGES) \
-	$(GIFIMAGES) \
 	$(PNMIMAGES) \
 	$(TIFFIMAGES)
 
diff --git a/test/Makefile.in b/test/Makefile.in
index b0fafbf5..46a49c3c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -413,10 +413,10 @@ AM_RECURSIVE_TARGETS = check recheck
 am__EXEEXT_3 = 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 \
+	tiffcp-logluv.sh tiffcp-thumbnail.sh tiffcp-lzw-compat.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 \
@@ -669,6 +669,7 @@ TESTSCRIPTS = \
 	tiffcp-g4.sh \
 	tiffcp-logluv.sh \
 	tiffcp-thumbnail.sh \
+	tiffcp-lzw-compat.sh \
 	tiffdump.sh \
 	tiffinfo.sh \
 	tiffcp-split.sh \
@@ -1211,6 +1212,13 @@ tiffcp-thumbnail.sh.log: tiffcp-thumbnail.sh
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+tiffcp-lzw-compat.sh.log: tiffcp-lzw-compat.sh
+	@p='tiffcp-lzw-compat.sh'; \
+	b='tiffcp-lzw-compat.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 tiffdump.sh.log: tiffdump.sh
 	@p='tiffdump.sh'; \
 	b='tiffdump.sh'; \
diff --git a/test/common.sh b/test/common.sh
index 643104b2..6b1380dd 100644
--- a/test/common.sh
+++ b/test/common.sh
@@ -9,13 +9,10 @@ TOOLS=`cd ../tools && pwd`
 IMAGES="${SRCDIR}/images"
 
 # Aliases for built tools
-BMP2TIFF=${TOOLS}/bmp2tiff
 FAX2PS=${TOOLS}/fax2ps
 FAX2TIFF=${TOOLS}/fax2tiff
-GIF2TIFF=${TOOLS}/gif2tiff
 PAL2RGB=${TOOLS}/pal2rgb
 PPM2TIFF=${TOOLS}/ppm2tiff
-RAS2TIFF=${TOOLS}/ras2tiff
 RAW2TIFF=${TOOLS}/raw2tiff
 RGB2YCBCR=${TOOLS}/rgb2ycbcr
 THUMBNAIL=${TOOLS}/thumbnail
@@ -43,11 +40,7 @@ IMG_PALETTE_1C_8B=${IMAGES}/palette-1c-8b.tiff
 IMG_RGB_3C_16B=${IMAGES}/rgb-3c-16b.tiff
 IMG_RGB_3C_8B=${IMAGES}/rgb-3c-8b.tiff
 IMG_MINISBLACK_2C_8B_ALPHA=${IMAGES}/minisblack-2c-8b-alpha.tiff
-
-IMG_PALETTE_1C_8B_BMP=${IMAGES}/palette-1c-8b.bmp
-IMG_RGB_3C_8B_BMP=${IMAGES}/rgb-3c-8b.bmp
-
-IMG_PALETTE_1C_8B_GIF=${IMAGES}/palette-1c-8b.gif
+IMG_QUAD_LZW_COMPAT=${IMAGES}/quad-lzw-compat.tiff
 
 IMG_MINISWHITE_1C_1B_PBM=${IMAGES}/miniswhite-1c-1b.pbm
 IMG_MINISBLACK_1C_8B_PGM=${IMAGES}/minisblack-1c-8b.pgm
diff --git a/test/images/quad-lzw-compat.tiff b/test/images/quad-lzw-compat.tiff
new file mode 100644
index 00000000..ec614bf6
--- /dev/null
+++ b/test/images/quad-lzw-compat.tiff
diff --git a/test/tiffcp-lzw-compat.sh b/test/tiffcp-lzw-compat.sh
new file mode 100755
index 00000000..bfc8d841
--- /dev/null
+++ b/test/tiffcp-lzw-compat.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Basic sanity check for tiffcp with LZW Old-LZW decompression
+#
+. ${srcdir:-.}/common.sh
+f_test_convert "${TIFFCP} -c none" "${IMG_QUAD_LZW_COMPAT}" "o-tiffcp-lzw-compat.tiff"
\ No newline at end of file