Fix test dependency on tiff2rgba-32BPP that breaks 'make check -jX'

Author: rouault

test/CMakeLists.txt

@@ -94,6 +94,7 @@ set(UNCOMPRESSEDIMAGES
 set(IMAGES_EXTRA_DIST
     images/README.txt
     images/miniswhite-1c-1b.g3
+    images/32bpp-None-jpeg.tiff
     ${BMPIMAGES}
     ${GIFIMAGES}
     ${PNMIMAGES}
@@ -446,8 +447,7 @@ if(tiff-tools)
 
   add_convert_test(tiff2rgba 32BPP    "-B 255 -n"     "images/32bpp-None.tiff" TRUE)
   if(JPEG_SUPPORT)
-    # use output of tiff2rgba-32BPP as input!
-    add_convert_test_multi_out_in(tiffcp "" "" 32BPP-JPEG "-c jpeg" "" ""       "tiff2rgba-32BPP-32bpp-None.tiff" TRUE)
+    add_convert_test(tiffcp 32BPP-JPEG "-c jpeg"      "images/32bpp-None-jpeg.tiff" TRUE)
   endif()
 
   if(JBIG_SUPPORT)

test/Makefile.am

@@ -247,6 +247,7 @@ IMAGES_EXTRA_DIST = \
 	images/test_two_ifds.tif \
 	images/test_ifd_loop_subifd.tif \
 	images/webp_lossless_rgba_alpha_fully_opaque.tif \
+	images/32bpp-None-jpeg.tiff \
 	$(PNMIMAGES) \
 	$(TIFFIMAGES)
 

test/images/32bpp-None-jpeg.tiff

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Generated file, master is Makefile.am
 . ${srcdir:-.}/common.sh
-infile="o-tiff2rgba-32bpp-None-jpeg.tiff"
+infile="$srcdir/images/32bpp-None-jpeg.tiff"
 outfile="o-tiffcp-32bpp-None-jpeg-YCbCr.tiff"
 f_test_convert "${TIFFCP} -c jpeg" $infile $outfile
 f_tiffinfo_validate $outfile

test/tiffcp-32bpp-None-jpeg.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Generated file, master is Makefile.am
 . ${srcdir:-.}/common.sh
-infile="o-tiff2rgba-32bpp-None-jpeg.tiff"
+infile="$srcdir/images/32bpp-None-jpeg.tiff"
 outfile="o-tiffcp-32bpp-None-jpeg-YCbCr.tiff"
 f_test_convert "${TIFFCROP} -c jpeg" $infile $outfile
 f_tiffinfo_validate $outfile