tiffcrop.sh into a collection of many specific tests. Re-wrote

all of the existing tests to be based on some simple shell
functions.  Make distcheck works again.

72 files changed, 420 insertions, 362 deletions

diff --git a/ChangeLog b/ChangeLog
index cbaf6150..392a66f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2009-08-23  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* test/Makefile.am, test/tiffcrop*.sh: Split previously existing
-	tiffcrop.sh into a collection of many specific tests.
+	tiffcrop.sh into a collection of many specific tests.  Re-wrote
+	all of the existing tests to be based on some simple shell
+	functions.  Make distcheck works again.
 
 2009-08-21  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 805ae667..f1205cfc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -43,7 +43,7 @@ XFAIL_TESTS = \
 	tiffcrop-R90-minisblack-2c-8b-alpha.sh
 
 # Extra files which should be cleaned by 'make clean'
-CLEANFILES = test_packbits.tif deleteme*
+CLEANFILES = test_packbits.tif o-*
 
 # Executable programs which need to be built in order to support tests
 check_PROGRAMS = ascii_tag long_tag short_tag strip_rw rewrite
@@ -107,7 +107,16 @@ TESTSCRIPTS = \
 	tiffcrop-R90-palette-1c-8b.sh \
 	tiffcrop-R90-rgb-3c-16b.sh \
 	tiffcrop-R90-rgb-3c-8b.sh \
-	tiff2rgba.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
 
 # This list should contain all of the TIFF files in the 'images'
 # subdirectory which are intended to be used as input images for
@@ -125,7 +134,8 @@ TIFFIMAGES = \
 	images/rgb-3c-8b.tiff
 
 # This list should include all of the files in the 'images'
-# subdirectory which are intended to be distributed.
+# subdirectory which are intended to be distributed.  This may include
+# files which are not currently used by the tests.
 IMAGES_EXTRA_DIST = \
 	images/README.txt \
 	$(TIFFIMAGES)
@@ -145,6 +155,22 @@ rewrite_LDADD = $(LIBTIFF)
 
 INCLUDES = -I$(top_srcdir)/libtiff
 
+generate-tiff2rgba-tests:
+	for file in $(TIFFIMAGES) ; \
+	do \
+	base=`basename $$file .tiff` ; \
+	testscript=$(srcdir)/tiff2rgba-$$base.sh ; \
+	( \
+	  echo "#!/bin/sh" ; \
+	  echo ". \$${srcdir:-.}/common.sh" ; \
+	  echo "infile=\"$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiff2rgba-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFF2RGBA\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
+	) > $$testscript ; \
+	chmod +x $$testscript ; \
+	done
+
 # Test rotations
 generate-tiffcrop-R90-tests:
 	for file in $(TIFFIMAGES) ; \
@@ -154,7 +180,10 @@ generate-tiffcrop-R90-tests:
 	( \
 	  echo "#!/bin/sh" ; \
 	  echo ". \$${srcdir:-.}/common.sh" ; \
-	  echo "f_test_convert \"\$$TIFFCROP -R90\" \"\$$srcdir/$$file\" \"deleteme-tiffcrop-R90-$$base.tiff\"" ; \
+	  echo "infile=\"\$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiffcrop-R90-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFFCROP -R90\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
 	) > $$testscript ; \
 	chmod +x $$testscript ; \
 	done
@@ -168,7 +197,10 @@ generate-tiffcrop-doubleflip-tests:
 	( \
 	  echo "#!/bin/sh" ; \
 	  echo ". \$${srcdir:-.}/common.sh" ; \
-	  echo "f_test_convert \"\$$TIFFCROP -F both\" \"\$$srcdir/$$file\" \"deleteme-tiffcrop-doubleflip-$$base.tiff\"" ; \
+	  echo "infile=\"\$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiffcrop-doubleflip-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFFCROP -F both\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
 	) > $$testscript ; \
 	chmod +x $$testscript ; \
 	done
@@ -182,7 +214,10 @@ generate-tiffcrop-extract-tests:
 	( \
 	  echo "#!/bin/sh" ; \
 	  echo ". \$${srcdir:-.}/common.sh" ; \
-	  echo "f_test_convert \"\$$TIFFCROP -U px -E top -X 100 -Y 100\" \"\$$srcdir/$$file\" \"deleteme-tiffcrop-extract-$$base.tiff\"" ; \
+	  echo "infile=\"\$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiffcrop-extract-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFFCROP -U px -E top -X 100 -Y 100\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
 	) > $$testscript ; \
 	chmod +x $$testscript ; \
 	done
@@ -196,7 +231,10 @@ generate-tiffcrop-extractz14-tests:
 	( \
 	  echo "#!/bin/sh" ; \
 	  echo ". \$${srcdir:-.}/common.sh" ; \
-	  echo "f_test_convert \"\$$TIFFCROP -E left -Z1:4,2:4\" \"\$$srcdir/$$file\" \"deleteme-tiffcrop-extractz14-$$base.tiff\"" ; \
+	  echo "infile=\"\$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiffcrop-extractz14-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFFCROP -E left -Z1:4,2:4\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
 	) > $$testscript ; \
 	chmod +x $$testscript ; \
 	done
@@ -205,4 +243,8 @@ generate-tiffcrop-tests: \
 	generate-tiffcrop-R90-tests \
 	generate-tiffcrop-doubleflip-tests \
 	generate-tiffcrop-extract-tests \
-	generate-tiffcrop-extractz14-tests
\ No newline at end of file
+	generate-tiffcrop-extractz14-tests
+
+generate-tests: \
+	generate-tiff2rgba-tests \
+	generate-tiffcrop-tests
\ No newline at end of file
diff --git a/test/Makefile.in b/test/Makefile.in
index 40222279..1fa5cde7 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -383,7 +383,7 @@ XFAIL_TESTS = \
 
 
 # Extra files which should be cleaned by 'make clean'
-CLEANFILES = test_packbits.tif deleteme*
+CLEANFILES = test_packbits.tif o-*
 
 # Test scripts to execute
 TESTSCRIPTS = \
@@ -444,7 +444,16 @@ TESTSCRIPTS = \
 	tiffcrop-R90-palette-1c-8b.sh \
 	tiffcrop-R90-rgb-3c-16b.sh \
 	tiffcrop-R90-rgb-3c-8b.sh \
-	tiff2rgba.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
 
 
 # This list should contain all of the TIFF files in the 'images'
@@ -464,7 +473,8 @@ TIFFIMAGES = \
 
 
 # This list should include all of the files in the 'images'
-# subdirectory which are intended to be distributed.
+# subdirectory which are intended to be distributed.  This may include
+# files which are not currently used by the tests.
 IMAGES_EXTRA_DIST = \
 	images/README.txt \
 	$(TIFFIMAGES)
@@ -912,8 +922,26 @@ tiffcrop-R90-rgb-3c-16b.sh.log: tiffcrop-R90-rgb-3c-16b.sh
 	@p='tiffcrop-R90-rgb-3c-16b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 tiffcrop-R90-rgb-3c-8b.sh.log: tiffcrop-R90-rgb-3c-8b.sh
 	@p='tiffcrop-R90-rgb-3c-8b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
-tiff2rgba.sh.log: tiff2rgba.sh
-	@p='tiff2rgba.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-logluv-3c-16b.sh.log: tiff2rgba-logluv-3c-16b.sh
+	@p='tiff2rgba-logluv-3c-16b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-minisblack-1c-16b.sh.log: tiff2rgba-minisblack-1c-16b.sh
+	@p='tiff2rgba-minisblack-1c-16b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-minisblack-1c-8b.sh.log: tiff2rgba-minisblack-1c-8b.sh
+	@p='tiff2rgba-minisblack-1c-8b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-minisblack-2c-8b-alpha.sh.log: tiff2rgba-minisblack-2c-8b-alpha.sh
+	@p='tiff2rgba-minisblack-2c-8b-alpha.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-miniswhite-1c-1b.sh.log: tiff2rgba-miniswhite-1c-1b.sh
+	@p='tiff2rgba-miniswhite-1c-1b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-palette-1c-1b.sh.log: tiff2rgba-palette-1c-1b.sh
+	@p='tiff2rgba-palette-1c-1b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-palette-1c-4b.sh.log: tiff2rgba-palette-1c-4b.sh
+	@p='tiff2rgba-palette-1c-4b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-palette-1c-8b.sh.log: tiff2rgba-palette-1c-8b.sh
+	@p='tiff2rgba-palette-1c-8b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-rgb-3c-16b.sh.log: tiff2rgba-rgb-3c-16b.sh
+	@p='tiff2rgba-rgb-3c-16b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+tiff2rgba-rgb-3c-8b.sh.log: tiff2rgba-rgb-3c-8b.sh
+	@p='tiff2rgba-rgb-3c-8b.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 .test.log:
 	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
 @am__EXEEXT_TRUE@.test$(EXEEXT).log:
@@ -1074,6 +1102,22 @@ uninstall-am:
 	recheck recheck-html tags uninstall uninstall-am
 
 
+generate-tiff2rgba-tests:
+	for file in $(TIFFIMAGES) ; \
+	do \
+	base=`basename $$file .tiff` ; \
+	testscript=$(srcdir)/tiff2rgba-$$base.sh ; \
+	( \
+	  echo "#!/bin/sh" ; \
+	  echo ". \$${srcdir:-.}/common.sh" ; \
+	  echo "infile=\"$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiff2rgba-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFF2RGBA\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
+	) > $$testscript ; \
+	chmod +x $$testscript ; \
+	done
+
 # Test rotations
 generate-tiffcrop-R90-tests:
 	for file in $(TIFFIMAGES) ; \
@@ -1083,7 +1127,10 @@ generate-tiffcrop-R90-tests:
 	( \
 	  echo "#!/bin/sh" ; \
 	  echo ". \$${srcdir:-.}/common.sh" ; \
-	  echo "f_test_convert \"\$$TIFFCROP -R90\" \"\$$srcdir/$$file\" \"deleteme-tiffcrop-R90-$$base.tiff\"" ; \
+	  echo "infile=\"\$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiffcrop-R90-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFFCROP -R90\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
 	) > $$testscript ; \
 	chmod +x $$testscript ; \
 	done
@@ -1097,7 +1144,10 @@ generate-tiffcrop-doubleflip-tests:
 	( \
 	  echo "#!/bin/sh" ; \
 	  echo ". \$${srcdir:-.}/common.sh" ; \
-	  echo "f_test_convert \"\$$TIFFCROP -F both\" \"\$$srcdir/$$file\" \"deleteme-tiffcrop-doubleflip-$$base.tiff\"" ; \
+	  echo "infile=\"\$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiffcrop-doubleflip-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFFCROP -F both\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
 	) > $$testscript ; \
 	chmod +x $$testscript ; \
 	done
@@ -1111,7 +1161,10 @@ generate-tiffcrop-extract-tests:
 	( \
 	  echo "#!/bin/sh" ; \
 	  echo ". \$${srcdir:-.}/common.sh" ; \
-	  echo "f_test_convert \"\$$TIFFCROP -U px -E top -X 100 -Y 100\" \"\$$srcdir/$$file\" \"deleteme-tiffcrop-extract-$$base.tiff\"" ; \
+	  echo "infile=\"\$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiffcrop-extract-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFFCROP -U px -E top -X 100 -Y 100\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
 	) > $$testscript ; \
 	chmod +x $$testscript ; \
 	done
@@ -1125,7 +1178,10 @@ generate-tiffcrop-extractz14-tests:
 	( \
 	  echo "#!/bin/sh" ; \
 	  echo ". \$${srcdir:-.}/common.sh" ; \
-	  echo "f_test_convert \"\$$TIFFCROP -E left -Z1:4,2:4\" \"\$$srcdir/$$file\" \"deleteme-tiffcrop-extractz14-$$base.tiff\"" ; \
+	  echo "infile=\"\$$srcdir/$$file\"" ; \
+	  echo "outfile=\"o-tiffcrop-extractz14-$$base.tiff\"" ; \
+	  echo "f_test_convert \"\$$TIFFCROP -E left -Z1:4,2:4\" \$$infile \$$outfile" ; \
+	  echo "f_tiffinfo_validate \$$outfile" ; \
 	) > $$testscript ; \
 	chmod +x $$testscript ; \
 	done
@@ -1136,6 +1192,10 @@ generate-tiffcrop-tests: \
 	generate-tiffcrop-extract-tests \
 	generate-tiffcrop-extractz14-tests
 
+generate-tests: \
+	generate-tiff2rgba-tests \
+	generate-tiffcrop-tests
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/test/common.sh b/test/common.sh
index 53d43ade..43f9faad 100644
--- a/test/common.sh
+++ b/test/common.sh
@@ -58,14 +58,38 @@ f_test_convert ()
   outfile=$3
   rm -f $outfile
   eval echo $command $infile $outfile
-  eval $command $infile $outfile
+  eval $MEMCHECK $command $infile $outfile
   status=$?
   if [ $status != 0 ] ; then
     echo "Returned failed status $status! Output (if any) is in ${outfile}."
-  else
-    rm -f $outfile
+    exit $status
   fi
-  exit $status
+}
+
+#
+# Execute a simple command (e.g. tiffinfo) with one input file
+#
+# f_test_exec command infile
+f_test_reader ()
+{ 
+  command=$1
+  infile=$2
+  eval echo $command $infile
+  eval $MEMCHECK $command $infile
+  status=$?
+  if [ $status != 0 ] ; then
+    echo "Returned failed status $status!"
+    exit $status
+  fi
+}
+
+#
+# Execute tiffinfo on a specified file to validate it
+#
+# f_tiffinfo_validate infile
+f_tiffinfo_validate ()
+{
+    f_test_reader "$TIFFINFO -D" $1
 }
 
 if test "$VERBOSE" = TRUE
diff --git a/test/tiff2pdf.sh b/test/tiff2pdf.sh
index 001a6117..833dc7f4 100755
--- a/test/tiff2pdf.sh
+++ b/test/tiff2pdf.sh
@@ -3,18 +3,4 @@
 # Basic sanity check for tiff2pdf
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.pdf
-
-operation=tiff2pdf
-${TIFF2PDF} -o $outfile ${IMG_MINISWHITE_1C_1B}
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} return $status).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFF2PDF}" "${IMG_MINISWHITE_1C_1B}" "> o-tiff2pdf.pdf"
\ No newline at end of file
diff --git a/test/tiff2ps-EPS1.sh b/test/tiff2ps-EPS1.sh
index 9e74fb27..b6abb990 100755
--- a/test/tiff2ps-EPS1.sh
+++ b/test/tiff2ps-EPS1.sh
@@ -3,18 +3,4 @@
 # Basic sanity check for tiffps with PostScript Level 1 encapsulated output
 #
 . ${srcdir:-.}/common.sh
-
-outfile=deleteme-$$.ps
-operation=tiff2ps
-${TIFF2PS} -a -e -1 ${IMG_MINISWHITE_1C_1B} > $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns $status).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFF2PS} -a -e -1" "${IMG_MINISWHITE_1C_1B}" "> o-tiff2ps-EPS1.ps"
\ No newline at end of file
diff --git a/test/tiff2ps-PS1.sh b/test/tiff2ps-PS1.sh
index 44d0426c..296a1487 100755
--- a/test/tiff2ps-PS1.sh
+++ b/test/tiff2ps-PS1.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffps with PostScript Level 1 output
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.ps
-operation=tiff2ps
-${TIFF2PS} -a -1 ${IMG_MINISWHITE_1C_1B} > $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFF2PS} -a -1" "${IMG_MINISWHITE_1C_1B}" "> o-tiff2ps-PS1.ps"
\ No newline at end of file
diff --git a/test/tiff2ps-PS2.sh b/test/tiff2ps-PS2.sh
index 2420de37..1d38ed94 100755
--- a/test/tiff2ps-PS2.sh
+++ b/test/tiff2ps-PS2.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffps with PostScript Level 2 output
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.ps
-operation=tiff2ps
-${TIFF2PS} -a -2 ${IMG_MINISWHITE_1C_1B} > $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFF2PS} -a -2" "${IMG_MINISWHITE_1C_1B}" "> o-tiff2ps-PS2.ps"
\ No newline at end of file
diff --git a/test/tiff2ps-PS3.sh b/test/tiff2ps-PS3.sh
index 50c54cdd..499dfa2d 100755
--- a/test/tiff2ps-PS3.sh
+++ b/test/tiff2ps-PS3.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffps with PostScript Level 3 output
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.ps
-operation=tiff2ps
-${TIFF2PS} -a -3 ${IMG_MINISWHITE_1C_1B} > $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFF2PS} -a -3" "${IMG_MINISWHITE_1C_1B}" "> o-tiff2ps-PS3.ps"
\ No newline at end of file
diff --git a/test/tiff2rgba-logluv-3c-16b.sh b/test/tiff2rgba-logluv-3c-16b.sh
new file mode 100755
index 00000000..d5624791
--- /dev/null
+++ b/test/tiff2rgba-logluv-3c-16b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/logluv-3c-16b.tiff"
+outfile="o-tiff2rgba-logluv-3c-16b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-minisblack-1c-16b.sh b/test/tiff2rgba-minisblack-1c-16b.sh
new file mode 100755
index 00000000..7a4b6d35
--- /dev/null
+++ b/test/tiff2rgba-minisblack-1c-16b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/minisblack-1c-16b.tiff"
+outfile="o-tiff2rgba-minisblack-1c-16b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-minisblack-1c-8b.sh b/test/tiff2rgba-minisblack-1c-8b.sh
new file mode 100755
index 00000000..9b52e349
--- /dev/null
+++ b/test/tiff2rgba-minisblack-1c-8b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/minisblack-1c-8b.tiff"
+outfile="o-tiff2rgba-minisblack-1c-8b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-minisblack-2c-8b-alpha.sh b/test/tiff2rgba-minisblack-2c-8b-alpha.sh
new file mode 100755
index 00000000..14199cea
--- /dev/null
+++ b/test/tiff2rgba-minisblack-2c-8b-alpha.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/minisblack-2c-8b-alpha.tiff"
+outfile="o-tiff2rgba-minisblack-2c-8b-alpha.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-miniswhite-1c-1b.sh b/test/tiff2rgba-miniswhite-1c-1b.sh
new file mode 100755
index 00000000..b7f12521
--- /dev/null
+++ b/test/tiff2rgba-miniswhite-1c-1b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/miniswhite-1c-1b.tiff"
+outfile="o-tiff2rgba-miniswhite-1c-1b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-palette-1c-1b.sh b/test/tiff2rgba-palette-1c-1b.sh
new file mode 100755
index 00000000..a2d7b4c2
--- /dev/null
+++ b/test/tiff2rgba-palette-1c-1b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/palette-1c-1b.tiff"
+outfile="o-tiff2rgba-palette-1c-1b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-palette-1c-4b.sh b/test/tiff2rgba-palette-1c-4b.sh
new file mode 100755
index 00000000..39e63526
--- /dev/null
+++ b/test/tiff2rgba-palette-1c-4b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/palette-1c-4b.tiff"
+outfile="o-tiff2rgba-palette-1c-4b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-palette-1c-8b.sh b/test/tiff2rgba-palette-1c-8b.sh
new file mode 100755
index 00000000..452c5501
--- /dev/null
+++ b/test/tiff2rgba-palette-1c-8b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/palette-1c-8b.tiff"
+outfile="o-tiff2rgba-palette-1c-8b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-rgb-3c-16b.sh b/test/tiff2rgba-rgb-3c-16b.sh
new file mode 100755
index 00000000..9119fc2e
--- /dev/null
+++ b/test/tiff2rgba-rgb-3c-16b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/rgb-3c-16b.tiff"
+outfile="o-tiff2rgba-rgb-3c-16b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba-rgb-3c-8b.sh b/test/tiff2rgba-rgb-3c-8b.sh
new file mode 100755
index 00000000..a5411e09
--- /dev/null
+++ b/test/tiff2rgba-rgb-3c-8b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="/images/rgb-3c-8b.tiff"
+outfile="o-tiff2rgba-rgb-3c-8b.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiff2rgba.sh b/test/tiff2rgba.sh
deleted file mode 100755
index bbc00e35..00000000
--- a/test/tiff2rgba.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Test a few case of the RGBA interface.
-#
-. ${srcdir:-.}/common.sh
-
-
-outfile=deleteme-$$.tif
-operation=tiff2rgba
-
-for FILE in \
-    minisblack-2c-8b-alpha.tiff \
-    palette-1c-1b.tiff \
-    palette-1c-8b.tiff \
-    rgb-3c-8b.tiff \
-    minisblack-1c-8b.tiff ; do 
-
-  ${TIFF2RGBA} images/$FILE tiff2rgba-$FILE
-  status=$?
-
-  if test $status -eq 0 ; then
-    rm -f tiff2rgba-$FILE
-  else
-    echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-    echo "  " tiff2rgba-$FILE
-  fi
-done
-
-exit $status
diff --git a/test/tiffcp-g3-1d-fill.sh b/test/tiffcp-g3-1d-fill.sh
index 9b399e15..ee124983 100755
--- a/test/tiffcp-g3-1d-fill.sh
+++ b/test/tiffcp-g3-1d-fill.sh
@@ -4,17 +4,4 @@
 # encoding, and zero-filled boundaries.
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.tif
-operation=tiffcp
-${TIFFCP} -c g3:1d:fill ${IMG_MINISWHITE_1C_1B} $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFFCP} -c g3:1d:fill" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3-1d-fill.tiff"
\ No newline at end of file
diff --git a/test/tiffcp-g3-1d.sh b/test/tiffcp-g3-1d.sh
index 9b1aac41..c11ef97f 100755
--- a/test/tiffcp-g3-1d.sh
+++ b/test/tiffcp-g3-1d.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffcp with G3 compression and 1 dimensional encoding.
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.tif
-operation=tiffcp
-${TIFFCP} -c g3:1d ${IMG_MINISWHITE_1C_1B} $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFFCP} -c g3:1d" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3-1d.tiff"
\ No newline at end of file
diff --git a/test/tiffcp-g3-2d-fill.sh b/test/tiffcp-g3-2d-fill.sh
index c0cd7bfa..c25825da 100755
--- a/test/tiffcp-g3-2d-fill.sh
+++ b/test/tiffcp-g3-2d-fill.sh
@@ -4,17 +4,4 @@
 # encoding, and zero-filled boundaries.
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.tif
-operation=tiffcp
-${TIFFCP} -c g3:2d:fill ${IMG_MINISWHITE_1C_1B} $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFFCP} -c g3:2d:fill" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3-2d-fill.tiff"
diff --git a/test/tiffcp-g3-2d.sh b/test/tiffcp-g3-2d.sh
index d57c394c..5a59dd2b 100755
--- a/test/tiffcp-g3-2d.sh
+++ b/test/tiffcp-g3-2d.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffcp with G3 compression and 2 dimensional encoding.
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.tif
-operation=tiffcp
-${TIFFCP} -c g3:2d ${IMG_MINISWHITE_1C_1B} $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFFCP} -c g3:2d" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3-2d.tiff"
\ No newline at end of file
diff --git a/test/tiffcp-g3.sh b/test/tiffcp-g3.sh
index 4f0e5ccf..d7a0107a 100755
--- a/test/tiffcp-g3.sh
+++ b/test/tiffcp-g3.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffcp with G3 compression
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.tif
-operation=tiffcp
-${TIFFCP} -c g3 ${IMG_MINISWHITE_1C_1B} $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFFCP} -c g3" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g3.tiff"
\ No newline at end of file
diff --git a/test/tiffcp-g4.sh b/test/tiffcp-g4.sh
index b8ac49a3..fb8967af 100755
--- a/test/tiffcp-g4.sh
+++ b/test/tiffcp-g4.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffcp with G4 compression
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.tif
-operation=tiffcp
-${TIFFCP} -c g4 ${IMG_MINISWHITE_1C_1B} $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_convert "${TIFFCP} -c g4" "${IMG_MINISWHITE_1C_1B}" "o-tiffcp-g4.tiff"
\ No newline at end of file
diff --git a/test/tiffcp-logluv.sh b/test/tiffcp-logluv.sh
index d41b4328..3f62f57b 100755
--- a/test/tiffcp-logluv.sh
+++ b/test/tiffcp-logluv.sh
@@ -1,24 +1,7 @@
 #!/bin/sh
 #
-# Basic sanity check for tiffcp with G3 compression
+# Basic sanity check for tiffcp with logluv compression
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-raw-$$.tif
-outfile2=deleteme-sgilog-$$.tif
-infile=${srcdir:-.}/images/logluv-3c-16b.tiff
-operation=tiffcp
-${TIFFCP} -c none ${infile} ${outfile}
-status=$?
-
-if test $status -eq 0 ; then
-  ${TIFFCP} -c sgilog ${outfile} ${outfile2}
-fi
-
-if test $status -eq 0 ; then
-    rm -f ${outfile} ${outfile2}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile} ${outfile2}
-fi
-
-exit $status
+f_test_convert "${TIFFCP} -c none" "${srcdir}/images/logluv-3c-16b.tiff" "o-tiffcp-logluv-raw.tiff"
+f_test_convert "${TIFFCP} -c sgilog" "o-tiffcp-logluv-raw.tiff" "o-tiffcp-logluv-sgilog.tiff"
\ No newline at end of file
diff --git a/test/tiffcp-split-join.sh b/test/tiffcp-split-join.sh
index 9aa2fee9..d1e407c9 100755
--- a/test/tiffcp-split-join.sh
+++ b/test/tiffcp-split-join.sh
@@ -7,32 +7,10 @@
 # tiffcp to recombine again.
 
 . ${srcdir:-.}/common.sh
-conjoined=deleteme-conjoined-$$.tif
-reconjoined=deleteme-reconjoined-$$.tif
-splitfile=deleteme-split-$$
+conjoined=o-tiffcp-split-join-conjoined.tif
+reconjoined=o-tiffcp-split-join-reconjoined.tif
+splitfile=o-tiffcp-split-join-split-
 
-operation=tiffcp
-${TIFFCP} ${IMG_UNCOMPRESSED} ${conjoined}
-status=$?
-if test $status -eq 0
-then
-  operation=tiffsplit
-  ${TIFFSPLIT} ${conjoined} ${splitfile}
-  status=$?
-  if test $status -eq 0
-  then
-    operation=tiffcp
-    ${TIFFCP} ${splitfile}* ${reconjoined}
-    status=$?
-  fi
-fi
-
-if test $status -eq 0
-then
-  rm -f ${conjoined} ${splitfile}* ${reconjoined}
-else
-  echo "Test failed (${operation} returned ${status}).  Please inspect these output files:"
-  echo "  " ${conjoined} ${splitfile}* ${reconjoined}
-fi
-
-exit $status
+f_test_convert "${TIFFCP}" "${IMG_UNCOMPRESSED}" "${conjoined}"
+f_test_convert "${TIFFSPLIT}" "${conjoined}" "${splitfile}"
+f_test_convert "${TIFFCP}" "${splitfile}*" "${reconjoined}"
\ No newline at end of file
diff --git a/test/tiffcp-split.sh b/test/tiffcp-split.sh
index 00b0d216..a2f98e33 100755
--- a/test/tiffcp-split.sh
+++ b/test/tiffcp-split.sh
@@ -6,27 +6,8 @@
 # and then we use tiffsplit to split them out again.
 #
 . ${srcdir:-.}/common.sh
-conjoined=deleteme-conjoined-$$.tif
-splitfile=deleteme-split-$$
+conjoined=o-tiffcp-split-conjoined.tif
+splitfile=o-tiffcp-split-split-
 
-operation=tiffcp
-${TIFFCP} ${IMG_UNCOMPRESSED} ${conjoined}
-status=$?
-
-if test $status -eq 0
-then
-  operation=tiffsplit
-  ${TIFFSPLIT} ${conjoined} ${splitfile}
-  status=$?
-fi
-
-if test $status -eq 0
-then
-  :
-  rm -f ${conjoined} ${splitfile}*
-else
-  echo "Test failed (${operation} returned ${status}).  Please inspect these output files:"
-  echo "  " ${conjoined} ${splitfile}* ${reconjoined}
-fi
-
-exit $status
+f_test_convert "${TIFFCP}" "${IMG_UNCOMPRESSED}" "${conjoined}"
+f_test_convert "${TIFFSPLIT}" "${conjoined}" "${splitfile}"
\ No newline at end of file
diff --git a/test/tiffcp-thumbnail.sh b/test/tiffcp-thumbnail.sh
index ad948a49..789cd802 100755
--- a/test/tiffcp-thumbnail.sh
+++ b/test/tiffcp-thumbnail.sh
@@ -4,29 +4,7 @@
 #
 . ${srcdir:-.}/common.sh
 
-outfile1=deleteme-in-$$.tif
-outfile2=deleteme-out-$$.tif
-stderr=deleteme-stderr-$$.tif
-operation=tiffcp
-${TIFFCP} -c g3:1d ${IMG_MINISWHITE_1C_1B} ${outfile1} 2> $stderr
-status=$?
-
-if test $status -eq 0
-then
-  operation=thumbnail
-  ${THUMBNAIL} ${outfile1} ${outfile2} 2>> $stderr
-  status=$?
-fi
-
-if test $status -eq 0
-then
-  rm -f ${outfile1} ${outfile2}
-else
-  cat $stderr
-  echo "Test failed (${operation} returned ${status}).  Please inspect these output files:"
-  echo "  " ${outfile1} ${outfile2}
-fi
-
-rm -f $stderr
-
-exit $status
+outfile1=o-tiffcp-thumbnail-in.tif
+outfile2=o-tiffcp-thumbnail-out.tif
+f_test_convert "${TIFFCP} -c g3:1d" "${IMG_MINISWHITE_1C_1B}" "${outfile1}"
+f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}"
\ No newline at end of file
diff --git a/test/tiffcrop-R90-logluv-3c-16b.sh b/test/tiffcrop-R90-logluv-3c-16b.sh
new file mode 100755
index 00000000..3f62d7dc
--- /dev/null
+++ b/test/tiffcrop-R90-logluv-3c-16b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/logluv-3c-16b.tiff"
+outfile="o-tiffcrop-R90-logluv-3c-16b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-minisblack-1c-16b.sh b/test/tiffcrop-R90-minisblack-1c-16b.sh
new file mode 100755
index 00000000..91ef46d9
--- /dev/null
+++ b/test/tiffcrop-R90-minisblack-1c-16b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/minisblack-1c-16b.tiff"
+outfile="o-tiffcrop-R90-minisblack-1c-16b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-minisblack-1c-8b.sh b/test/tiffcrop-R90-minisblack-1c-8b.sh
new file mode 100755
index 00000000..39c8006f
--- /dev/null
+++ b/test/tiffcrop-R90-minisblack-1c-8b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/minisblack-1c-8b.tiff"
+outfile="o-tiffcrop-R90-minisblack-1c-8b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-minisblack-2c-8b-alpha.sh b/test/tiffcrop-R90-minisblack-2c-8b-alpha.sh
new file mode 100755
index 00000000..f6c45bfd
--- /dev/null
+++ b/test/tiffcrop-R90-minisblack-2c-8b-alpha.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/minisblack-2c-8b-alpha.tiff"
+outfile="o-tiffcrop-R90-minisblack-2c-8b-alpha.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-miniswhite-1c-1b.sh b/test/tiffcrop-R90-miniswhite-1c-1b.sh
new file mode 100755
index 00000000..f1602271
--- /dev/null
+++ b/test/tiffcrop-R90-miniswhite-1c-1b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/miniswhite-1c-1b.tiff"
+outfile="o-tiffcrop-R90-miniswhite-1c-1b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-palette-1c-1b.sh b/test/tiffcrop-R90-palette-1c-1b.sh
new file mode 100755
index 00000000..4b334ee3
--- /dev/null
+++ b/test/tiffcrop-R90-palette-1c-1b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/palette-1c-1b.tiff"
+outfile="o-tiffcrop-R90-palette-1c-1b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-palette-1c-4b.sh b/test/tiffcrop-R90-palette-1c-4b.sh
new file mode 100755
index 00000000..f203508d
--- /dev/null
+++ b/test/tiffcrop-R90-palette-1c-4b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/palette-1c-4b.tiff"
+outfile="o-tiffcrop-R90-palette-1c-4b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-palette-1c-8b.sh b/test/tiffcrop-R90-palette-1c-8b.sh
new file mode 100755
index 00000000..27a64488
--- /dev/null
+++ b/test/tiffcrop-R90-palette-1c-8b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/palette-1c-8b.tiff"
+outfile="o-tiffcrop-R90-palette-1c-8b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-rgb-3c-16b.sh b/test/tiffcrop-R90-rgb-3c-16b.sh
new file mode 100755
index 00000000..a2d1cad8
--- /dev/null
+++ b/test/tiffcrop-R90-rgb-3c-16b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/rgb-3c-16b.tiff"
+outfile="o-tiffcrop-R90-rgb-3c-16b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-R90-rgb-3c-8b.sh b/test/tiffcrop-R90-rgb-3c-8b.sh
new file mode 100755
index 00000000..90aecfca
--- /dev/null
+++ b/test/tiffcrop-R90-rgb-3c-8b.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/rgb-3c-8b.tiff"
+outfile="o-tiffcrop-R90-rgb-3c-8b.tiff"
+f_test_convert "$TIFFCROP -R90" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-logluv-3c-16b.sh b/test/tiffcrop-doubleflip-logluv-3c-16b.sh
index 9ff94b59..6ba4ee99 100755
--- a/test/tiffcrop-doubleflip-logluv-3c-16b.sh
+++ b/test/tiffcrop-doubleflip-logluv-3c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/logluv-3c-16b.tiff" "deleteme-tiffcrop-doubleflip-logluv-3c-16b.tiff"
+infile="$srcdir/images/logluv-3c-16b.tiff"
+outfile="o-tiffcrop-doubleflip-logluv-3c-16b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-minisblack-1c-16b.sh b/test/tiffcrop-doubleflip-minisblack-1c-16b.sh
index b6121448..a2f3c13b 100755
--- a/test/tiffcrop-doubleflip-minisblack-1c-16b.sh
+++ b/test/tiffcrop-doubleflip-minisblack-1c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/minisblack-1c-16b.tiff" "deleteme-tiffcrop-doubleflip-minisblack-1c-16b.tiff"
+infile="$srcdir/images/minisblack-1c-16b.tiff"
+outfile="o-tiffcrop-doubleflip-minisblack-1c-16b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-minisblack-1c-8b.sh b/test/tiffcrop-doubleflip-minisblack-1c-8b.sh
index 1084eced..e4239dd0 100755
--- a/test/tiffcrop-doubleflip-minisblack-1c-8b.sh
+++ b/test/tiffcrop-doubleflip-minisblack-1c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/minisblack-1c-8b.tiff" "deleteme-tiffcrop-doubleflip-minisblack-1c-8b.tiff"
+infile="$srcdir/images/minisblack-1c-8b.tiff"
+outfile="o-tiffcrop-doubleflip-minisblack-1c-8b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-minisblack-2c-8b-alpha.sh b/test/tiffcrop-doubleflip-minisblack-2c-8b-alpha.sh
index d83bcaa3..fd97a028 100755
--- a/test/tiffcrop-doubleflip-minisblack-2c-8b-alpha.sh
+++ b/test/tiffcrop-doubleflip-minisblack-2c-8b-alpha.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/minisblack-2c-8b-alpha.tiff" "deleteme-tiffcrop-doubleflip-minisblack-2c-8b-alpha.tiff"
+infile="$srcdir/images/minisblack-2c-8b-alpha.tiff"
+outfile="o-tiffcrop-doubleflip-minisblack-2c-8b-alpha.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-miniswhite-1c-1b.sh b/test/tiffcrop-doubleflip-miniswhite-1c-1b.sh
index 036fa017..33765e38 100755
--- a/test/tiffcrop-doubleflip-miniswhite-1c-1b.sh
+++ b/test/tiffcrop-doubleflip-miniswhite-1c-1b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/miniswhite-1c-1b.tiff" "deleteme-tiffcrop-doubleflip-miniswhite-1c-1b.tiff"
+infile="$srcdir/images/miniswhite-1c-1b.tiff"
+outfile="o-tiffcrop-doubleflip-miniswhite-1c-1b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-palette-1c-1b.sh b/test/tiffcrop-doubleflip-palette-1c-1b.sh
index 01d2f0c0..01e5b1bc 100755
--- a/test/tiffcrop-doubleflip-palette-1c-1b.sh
+++ b/test/tiffcrop-doubleflip-palette-1c-1b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/palette-1c-1b.tiff" "deleteme-tiffcrop-doubleflip-palette-1c-1b.tiff"
+infile="$srcdir/images/palette-1c-1b.tiff"
+outfile="o-tiffcrop-doubleflip-palette-1c-1b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-palette-1c-4b.sh b/test/tiffcrop-doubleflip-palette-1c-4b.sh
index 5c7d7bfe..11788039 100755
--- a/test/tiffcrop-doubleflip-palette-1c-4b.sh
+++ b/test/tiffcrop-doubleflip-palette-1c-4b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/palette-1c-4b.tiff" "deleteme-tiffcrop-doubleflip-palette-1c-4b.tiff"
+infile="$srcdir/images/palette-1c-4b.tiff"
+outfile="o-tiffcrop-doubleflip-palette-1c-4b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-palette-1c-8b.sh b/test/tiffcrop-doubleflip-palette-1c-8b.sh
index a7e08978..29938264 100755
--- a/test/tiffcrop-doubleflip-palette-1c-8b.sh
+++ b/test/tiffcrop-doubleflip-palette-1c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/palette-1c-8b.tiff" "deleteme-tiffcrop-doubleflip-palette-1c-8b.tiff"
+infile="$srcdir/images/palette-1c-8b.tiff"
+outfile="o-tiffcrop-doubleflip-palette-1c-8b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-rgb-3c-16b.sh b/test/tiffcrop-doubleflip-rgb-3c-16b.sh
index 20c89d62..441b994c 100755
--- a/test/tiffcrop-doubleflip-rgb-3c-16b.sh
+++ b/test/tiffcrop-doubleflip-rgb-3c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/rgb-3c-16b.tiff" "deleteme-tiffcrop-doubleflip-rgb-3c-16b.tiff"
+infile="$srcdir/images/rgb-3c-16b.tiff"
+outfile="o-tiffcrop-doubleflip-rgb-3c-16b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-doubleflip-rgb-3c-8b.sh b/test/tiffcrop-doubleflip-rgb-3c-8b.sh
index 216e1b36..432a8b61 100755
--- a/test/tiffcrop-doubleflip-rgb-3c-8b.sh
+++ b/test/tiffcrop-doubleflip-rgb-3c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -F both" "$srcdir/images/rgb-3c-8b.tiff" "deleteme-tiffcrop-doubleflip-rgb-3c-8b.tiff"
+infile="$srcdir/images/rgb-3c-8b.tiff"
+outfile="o-tiffcrop-doubleflip-rgb-3c-8b.tiff"
+f_test_convert "$TIFFCROP -F both" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-logluv-3c-16b.sh b/test/tiffcrop-extract-logluv-3c-16b.sh
index 448faa19..4083fdac 100755
--- a/test/tiffcrop-extract-logluv-3c-16b.sh
+++ b/test/tiffcrop-extract-logluv-3c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/logluv-3c-16b.tiff" "deleteme-tiffcrop-extract-logluv-3c-16b.tiff"
+infile="$srcdir/images/logluv-3c-16b.tiff"
+outfile="o-tiffcrop-extract-logluv-3c-16b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-minisblack-1c-16b.sh b/test/tiffcrop-extract-minisblack-1c-16b.sh
index e0f23aa5..4e367741 100755
--- a/test/tiffcrop-extract-minisblack-1c-16b.sh
+++ b/test/tiffcrop-extract-minisblack-1c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/minisblack-1c-16b.tiff" "deleteme-tiffcrop-extract-minisblack-1c-16b.tiff"
+infile="$srcdir/images/minisblack-1c-16b.tiff"
+outfile="o-tiffcrop-extract-minisblack-1c-16b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-minisblack-1c-8b.sh b/test/tiffcrop-extract-minisblack-1c-8b.sh
index e851b826..1a711dee 100755
--- a/test/tiffcrop-extract-minisblack-1c-8b.sh
+++ b/test/tiffcrop-extract-minisblack-1c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/minisblack-1c-8b.tiff" "deleteme-tiffcrop-extract-minisblack-1c-8b.tiff"
+infile="$srcdir/images/minisblack-1c-8b.tiff"
+outfile="o-tiffcrop-extract-minisblack-1c-8b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-minisblack-2c-8b-alpha.sh b/test/tiffcrop-extract-minisblack-2c-8b-alpha.sh
index b273ae6b..7f3d0d4d 100755
--- a/test/tiffcrop-extract-minisblack-2c-8b-alpha.sh
+++ b/test/tiffcrop-extract-minisblack-2c-8b-alpha.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/minisblack-2c-8b-alpha.tiff" "deleteme-tiffcrop-extract-minisblack-2c-8b-alpha.tiff"
+infile="$srcdir/images/minisblack-2c-8b-alpha.tiff"
+outfile="o-tiffcrop-extract-minisblack-2c-8b-alpha.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-miniswhite-1c-1b.sh b/test/tiffcrop-extract-miniswhite-1c-1b.sh
index 2dad1ef2..8aadfcaa 100755
--- a/test/tiffcrop-extract-miniswhite-1c-1b.sh
+++ b/test/tiffcrop-extract-miniswhite-1c-1b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/miniswhite-1c-1b.tiff" "deleteme-tiffcrop-extract-miniswhite-1c-1b.tiff"
+infile="$srcdir/images/miniswhite-1c-1b.tiff"
+outfile="o-tiffcrop-extract-miniswhite-1c-1b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-palette-1c-1b.sh b/test/tiffcrop-extract-palette-1c-1b.sh
index 3b2e2321..f360eefd 100755
--- a/test/tiffcrop-extract-palette-1c-1b.sh
+++ b/test/tiffcrop-extract-palette-1c-1b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/palette-1c-1b.tiff" "deleteme-tiffcrop-extract-palette-1c-1b.tiff"
+infile="$srcdir/images/palette-1c-1b.tiff"
+outfile="o-tiffcrop-extract-palette-1c-1b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-palette-1c-4b.sh b/test/tiffcrop-extract-palette-1c-4b.sh
index 6f00e4a6..5bce65d6 100755
--- a/test/tiffcrop-extract-palette-1c-4b.sh
+++ b/test/tiffcrop-extract-palette-1c-4b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/palette-1c-4b.tiff" "deleteme-tiffcrop-extract-palette-1c-4b.tiff"
+infile="$srcdir/images/palette-1c-4b.tiff"
+outfile="o-tiffcrop-extract-palette-1c-4b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-palette-1c-8b.sh b/test/tiffcrop-extract-palette-1c-8b.sh
index 65716789..62dd756d 100755
--- a/test/tiffcrop-extract-palette-1c-8b.sh
+++ b/test/tiffcrop-extract-palette-1c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/palette-1c-8b.tiff" "deleteme-tiffcrop-extract-palette-1c-8b.tiff"
+infile="$srcdir/images/palette-1c-8b.tiff"
+outfile="o-tiffcrop-extract-palette-1c-8b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-rgb-3c-16b.sh b/test/tiffcrop-extract-rgb-3c-16b.sh
index 0ced9d3b..0f2a2c8b 100755
--- a/test/tiffcrop-extract-rgb-3c-16b.sh
+++ b/test/tiffcrop-extract-rgb-3c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/rgb-3c-16b.tiff" "deleteme-tiffcrop-extract-rgb-3c-16b.tiff"
+infile="$srcdir/images/rgb-3c-16b.tiff"
+outfile="o-tiffcrop-extract-rgb-3c-16b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extract-rgb-3c-8b.sh b/test/tiffcrop-extract-rgb-3c-8b.sh
index c8a2efd9..c1809ec8 100755
--- a/test/tiffcrop-extract-rgb-3c-8b.sh
+++ b/test/tiffcrop-extract-rgb-3c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" "$srcdir/images/rgb-3c-8b.tiff" "deleteme-tiffcrop-extract-rgb-3c-8b.tiff"
+infile="$srcdir/images/rgb-3c-8b.tiff"
+outfile="o-tiffcrop-extract-rgb-3c-8b.tiff"
+f_test_convert "$TIFFCROP -U px -E top -X 100 -Y 100" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-logluv-3c-16b.sh b/test/tiffcrop-extractz14-logluv-3c-16b.sh
index 568a67c9..c4e89707 100755
--- a/test/tiffcrop-extractz14-logluv-3c-16b.sh
+++ b/test/tiffcrop-extractz14-logluv-3c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/logluv-3c-16b.tiff" "deleteme-tiffcrop-extractz14-logluv-3c-16b.tiff"
+infile="$srcdir/images/logluv-3c-16b.tiff"
+outfile="o-tiffcrop-extractz14-logluv-3c-16b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-minisblack-1c-16b.sh b/test/tiffcrop-extractz14-minisblack-1c-16b.sh
index 8f57b540..1261944d 100755
--- a/test/tiffcrop-extractz14-minisblack-1c-16b.sh
+++ b/test/tiffcrop-extractz14-minisblack-1c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/minisblack-1c-16b.tiff" "deleteme-tiffcrop-extractz14-minisblack-1c-16b.tiff"
+infile="$srcdir/images/minisblack-1c-16b.tiff"
+outfile="o-tiffcrop-extractz14-minisblack-1c-16b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-minisblack-1c-8b.sh b/test/tiffcrop-extractz14-minisblack-1c-8b.sh
index fd9909dc..c85ab998 100755
--- a/test/tiffcrop-extractz14-minisblack-1c-8b.sh
+++ b/test/tiffcrop-extractz14-minisblack-1c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/minisblack-1c-8b.tiff" "deleteme-tiffcrop-extractz14-minisblack-1c-8b.tiff"
+infile="$srcdir/images/minisblack-1c-8b.tiff"
+outfile="o-tiffcrop-extractz14-minisblack-1c-8b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-minisblack-2c-8b-alpha.sh b/test/tiffcrop-extractz14-minisblack-2c-8b-alpha.sh
index dbf621fe..dd1cbdb4 100755
--- a/test/tiffcrop-extractz14-minisblack-2c-8b-alpha.sh
+++ b/test/tiffcrop-extractz14-minisblack-2c-8b-alpha.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/minisblack-2c-8b-alpha.tiff" "deleteme-tiffcrop-extractz14-minisblack-2c-8b-alpha.tiff"
+infile="$srcdir/images/minisblack-2c-8b-alpha.tiff"
+outfile="o-tiffcrop-extractz14-minisblack-2c-8b-alpha.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-miniswhite-1c-1b.sh b/test/tiffcrop-extractz14-miniswhite-1c-1b.sh
index 0702734c..3dbcd00b 100755
--- a/test/tiffcrop-extractz14-miniswhite-1c-1b.sh
+++ b/test/tiffcrop-extractz14-miniswhite-1c-1b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/miniswhite-1c-1b.tiff" "deleteme-tiffcrop-extractz14-miniswhite-1c-1b.tiff"
+infile="$srcdir/images/miniswhite-1c-1b.tiff"
+outfile="o-tiffcrop-extractz14-miniswhite-1c-1b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-palette-1c-1b.sh b/test/tiffcrop-extractz14-palette-1c-1b.sh
index 5b901f84..3cb86d79 100755
--- a/test/tiffcrop-extractz14-palette-1c-1b.sh
+++ b/test/tiffcrop-extractz14-palette-1c-1b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/palette-1c-1b.tiff" "deleteme-tiffcrop-extractz14-palette-1c-1b.tiff"
+infile="$srcdir/images/palette-1c-1b.tiff"
+outfile="o-tiffcrop-extractz14-palette-1c-1b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-palette-1c-4b.sh b/test/tiffcrop-extractz14-palette-1c-4b.sh
index 3b93dee2..fb012760 100755
--- a/test/tiffcrop-extractz14-palette-1c-4b.sh
+++ b/test/tiffcrop-extractz14-palette-1c-4b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/palette-1c-4b.tiff" "deleteme-tiffcrop-extractz14-palette-1c-4b.tiff"
+infile="$srcdir/images/palette-1c-4b.tiff"
+outfile="o-tiffcrop-extractz14-palette-1c-4b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-palette-1c-8b.sh b/test/tiffcrop-extractz14-palette-1c-8b.sh
index 8895c756..cf4db3a0 100755
--- a/test/tiffcrop-extractz14-palette-1c-8b.sh
+++ b/test/tiffcrop-extractz14-palette-1c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/palette-1c-8b.tiff" "deleteme-tiffcrop-extractz14-palette-1c-8b.tiff"
+infile="$srcdir/images/palette-1c-8b.tiff"
+outfile="o-tiffcrop-extractz14-palette-1c-8b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-rgb-3c-16b.sh b/test/tiffcrop-extractz14-rgb-3c-16b.sh
index 9e1e6ca3..6de8b8b5 100755
--- a/test/tiffcrop-extractz14-rgb-3c-16b.sh
+++ b/test/tiffcrop-extractz14-rgb-3c-16b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/rgb-3c-16b.tiff" "deleteme-tiffcrop-extractz14-rgb-3c-16b.tiff"
+infile="$srcdir/images/rgb-3c-16b.tiff"
+outfile="o-tiffcrop-extractz14-rgb-3c-16b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-extractz14-rgb-3c-8b.sh b/test/tiffcrop-extractz14-rgb-3c-8b.sh
index 83c5c6a4..fa6f0a8e 100755
--- a/test/tiffcrop-extractz14-rgb-3c-8b.sh
+++ b/test/tiffcrop-extractz14-rgb-3c-8b.sh
@@ -1,3 +1,6 @@
 #!/bin/sh
 . ${srcdir:-.}/common.sh
-f_test_convert "$TIFFCROP -E left -Z1:4,2:4" "$srcdir/images/rgb-3c-8b.tiff" "deleteme-tiffcrop-extractz14-rgb-3c-8b.tiff"
+infile="$srcdir/images/rgb-3c-8b.tiff"
+outfile="o-tiffcrop-extractz14-rgb-3c-8b.tiff"
+f_test_convert "$TIFFCROP -E left -Z1:4,2:4" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffdump.sh b/test/tiffdump.sh
index 5bb33d89..3cd7c10b 100755
--- a/test/tiffdump.sh
+++ b/test/tiffdump.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffdump
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.txt
-operation=tiffdump
-${TIFFDUMP} ${IMG_MINISWHITE_1C_1B} > $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_reader "${TIFFDUMP}" "${IMG_MINISWHITE_1C_1B}"
\ No newline at end of file
diff --git a/test/tiffinfo.sh b/test/tiffinfo.sh
index 6d3f43ad..cb572483 100755
--- a/test/tiffinfo.sh
+++ b/test/tiffinfo.sh
@@ -3,17 +3,4 @@
 # Basic sanity check for tiffinfo.
 #
 . ${srcdir:-.}/common.sh
-outfile=deleteme-$$.txt
-operation=tiffinfo
-${TIFFINFO} -c -D -d -j -s ${IMG_MINISBLACK_1C_16B} > $outfile
-status=$?
-
-if test $status -eq 0
-then
-  rm -f ${outfile}
-else
-  echo "Test failed (${operation} returns ${status}).  Please inspect these output files:"
-  echo "  " ${outfile}
-fi
-
-exit $status
+f_test_reader "${TIFFINFO} -c -D -d -j -s " "${IMG_MINISBLACK_1C_16B}"