Use red plane of testimg.ppm for test PGM input; rewrite file names which use tmpdir in the manner of symmetry.test; add some failure messages

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2225 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 13 insertions, 5 deletions

diff --git a/test/pnmtile.test b/test/pnmtile.test
index f74bdce3..40d9cfc2 100755
--- a/test/pnmtile.test
+++ b/test/pnmtile.test
@@ -6,12 +6,20 @@
   alias pnmcat="${PBM_BINPREFIX}pnmcat"
   shopt -s expand_aliases
 
+# Test 1.  Should print 4228632379 259
 pnmtile 40 50 testgrid.pbm | cksum
 
-pnmtile 454 298 testimg.ppm > ${tmpdir}/testimg4.ppm &&
-pnmcat -lr testimg.ppm testimg.ppm > ${tmpdir}/testimg2.ppm &&
-pnmcat -tb ${tmpdir}/testimg2.ppm ${tmpdir}/testimg2.ppm | \
-cmp -s - ${tmpdir}/testimg4.ppm
+tmpdir=${tmpdir:-/tmp}
+
+# Test 2.  Compare 2x2 tile images produced by pnmtile and pnmcat
+# Should print 0
+testimg2_ppm=${tmpdir}/testimg2.ppm
+testimg4_ppm=${tmpdir}/testimg4.ppm
+
+pnmtile 454 298 testimg.ppm > ${testimg4_ppm} &&
+pnmcat -lr testimg.ppm testimg.ppm > ${testimg2_ppm} &&
+pnmcat -tb ${testimg2_ppm} ${testimg2_ppm} | \
+cmp -s - ${testimg4_ppm}
 echo $?
 
-rm ${tmpdir}/testimg{2,4}.ppm
+rm ${testimg2_ppm} ${testimg4_ppm}