summaryrefslogtreecommitdiff
path: root/test/tiffcp-split-join.sh
diff options
context:
space:
mode:
authorBob Friesenhahn <bfriesen@simple.dallas.tx.us>2009-08-23 22:58:25 +0000
committerBob Friesenhahn <bfriesen@simple.dallas.tx.us>2009-08-23 22:58:25 +0000
commit63e03ebcecfe099b704c7c8cac93e8535aaf4c88 (patch)
treed3c20d065b5ebb9f044df7212c09968d8feb73d4 /test/tiffcp-split-join.sh
parent3237e5e1777dbdcd156ae231ccdd097be63eca2d (diff)
downloadlibtiff-git-63e03ebcecfe099b704c7c8cac93e8535aaf4c88.tar.gz
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.
Diffstat (limited to 'test/tiffcp-split-join.sh')
-rwxr-xr-xtest/tiffcp-split-join.sh34
1 files changed, 6 insertions, 28 deletions
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