Reverse messed up commit

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

5 files changed, 47 insertions, 32 deletions

diff --git a/test/Test-Order b/test/Test-Order
index 9a9210e4..ff4b9855 100644
--- a/test/Test-Order
+++ b/test/Test-Order
@@ -50,8 +50,7 @@ pamditherbw.test
 pbmclean.test
 pamcut.test
 pnmcat.test
-pamflip1.test
-pamflip2.test
+pamflip.test
 pamenlarge.test
 pnminvert.test
 pamchannel.test
diff --git a/test/pamflip.ok b/test/pamflip.ok
new file mode 100644
index 00000000..c7427e46
--- /dev/null
+++ b/test/pamflip.ok
@@ -0,0 +1,6 @@
+2116496681 101484
+217037000 101484
+2052917888 101484
+3375384165 41
+604323149 41
+490797850 37
diff --git a/test/pamflip.test b/test/pamflip.test
new file mode 100755
index 00000000..4ea275bd
--- /dev/null
+++ b/test/pamflip.test
@@ -0,0 +1,19 @@
+#! /bin/bash
+# This script tests: pamflip
+# Also requires: 
+
+  alias pamflip="${PBM_TESTPREFIX}pamflip"
+  shopt -s expand_aliases
+
+# Test 1.  Should print 2116496681 101484
+pamflip -lr testimg.ppm | cksum 
+# Test 2.  Should print 217037000 101484
+pamflip -cw testimg.ppm | cksum
+# Test 3.  Should print 2052917888 101484
+pamflip -tb testimg.ppm | cksum
+# Test 4.  Should print 3375384165 41
+pamflip -lr testgrid.pbm | cksum
+# Test 5.  Should print 604323149 41
+pamflip -tb testgrid.pbm | cksum
+# Test 6.  Should print 490797850 37
+pamflip -cw testgrid.pbm | cksum
diff --git a/test/ppmcie.test b/test/ppmcie.test
index c4338195..2584ece4 100755
--- a/test/ppmcie.test
+++ b/test/ppmcie.test
@@ -40,8 +40,8 @@ pamsumm --mean --brief ${tmpdir}/ppmcie.ppm | \
 # x86 64 bit: 0.002478
 
 pamsharpness ${tmpdir}/ppmcie.ppm 2>&1 | \
-  awk 'NF==3 && $1=="Sharpness" \
-       {if (0.002475 < $3 && $3 < 0.002479) print "ok"; else print $3}
-       NF>0 && NF!=3 {print "error"}'
+  awk 'NF==4 && $2=="Sharpness" \
+       {if (0.002475 < $4 && $4 < 0.002479) print "ok"; else print $4}
+       NF>0 && NF!=4 {print "error"}'
 
 rm ${tmpdir}/ppmcie.ppm
diff --git a/test/symmetry.test b/test/symmetry.test
index 5f09e91e..5fdb3918 100755
--- a/test/symmetry.test
+++ b/test/symmetry.test
@@ -29,76 +29,67 @@
 ## Failure with this test indicates that a generator or editor which
 ## should produce symmetric output images isn't doing so.
 
-tmpdir=${tmpdir:-/tmp}
-
 # Test 1.
-rect_pgm=${tmpdir}/rect.pgm
-
-pgmramp -rect 31 31 > ${rect_pgm}
+pgmramp -rect 31 31 > ${tmpdir}/rect.pgm
 
 ( for op in -null -tb -lr -r90
-    do pamflip $op ${rect_pgm} | cksum
+    do pamflip $op ${tmpdir}/rect.pgm | cksum
     done ) | uniq -c | \
   awk '$1==4 && $3>0 { print "ok"; exit }; { print }'
 
-rm ${rect_pgm}
+rm ${tmpdir}/rect.pgm
 
 # Test 2.
-circle_pgm=${tmpdir}/circle.pgm
-pgmramp -ell 63 63 > ${circle_pgm}
+pgmramp -ell 63 63 > ${tmpdir}/circle.pgm
 
 ( for op in -null -tb -lr -r90
-    do pamflip $op ${circle_pgm} | cksum
+    do pamflip $op ${tmpdir}/circle.pgm | cksum
     done ) | uniq -c | \
   awk '$1==4 && $3>0 { print "ok"; exit }; { print }'
 
-rm ${circle_pgm}
+rm ${tmpdir}/circle.pgm
 
 # Test 3.
-gauss_pgm=${tmpdir}/gauss.pgm
-pamgauss -sigma=0.1 -tupletype=GRAYSCALE 25 25 > ${gauss_pgm}
+pamgauss -sigma=0.1 -tupletype=GRAYSCALE 25 25 > ${tmpdir}/gauss.pam
 
 ( for op in -null -tb -lr -r90
-    do pamflip $op ${gauss_pgm} | cksum
+    do pamflip $op ${tmpdir}/gauss.pam | cksum
     done ) | uniq -c | \
   awk '$1==4 && $3>0 { print "ok"; exit }; { print }'
 
-rm ${gauss_pgm}
+rm ${tmpdir}/gauss.pam
 
 # Test 4.
-kernel_pgm=${tmpdir}/kernel.pgm
-pgmkernel 15 15 > ${kernel_pgm}
+pgmkernel 15 15 > ${tmpdir}/kernel.pgm
 
 ( for op in -null -tb -lr -r90
-    do pamflip $op ${kernel_pgm} | cksum
+    do pamflip $op ${tmpdir}/kernel.pgm | cksum
     done ) | uniq -c | \
   awk '$1==4 && $3>0 { print "ok"; exit }; { print }'
 
-rm ${kernel_pgm}
+rm ${tmpdir}/kernel.pgm
 
 # Test 5.
 # Should print "ok" 7 times.
-pscale_pbm=${tmpdir}/pscale.pbm
 for size in `seq 1 7`
 do
-pbmmake -g 5 5 | pbmpscale $size > ${pscale_pbm}
+pbmmake -g 5 5 | pbmpscale $size > ${tmpdir}/pscale.pbm
 
 ( for op in -null -tb -lr -r90
-    do pamflip $op ${pscale_pbm} | cksum
+    do pamflip $op ${tmpdir}/pscale.pbm | cksum
     done ) | uniq -c | \
   awk '$1==4 && $3>0 { print "ok"; exit }; { print }'
 
-rm ${pscale_pbm}
+rm ${tmpdir}/pscale.pbm
 done
 
 # Test 6.
-ell_pgm=${tmpdir}/ell.pgm
-pgmramp -ell 101 33 > ${ell_pgm}
+pgmramp -ell 101 33 > ${tmpdir}/ell.pgm
 
 ( for op in -null -tb -lr
-  do pamflip $op ${ell_pgm} | cksum
+  do pamflip $op ${tmpdir}/ell.pgm | cksum
   done ) | uniq -c | \
   awk '$1==3 && $3>0 { print "ok"; exit }; { print }'
 
-rm ${ell_pgm}
+rm ${tmpdir}/ell.pgm