1 files changed, 15 insertions, 20 deletions
diff --git a/test/pamsumm.test b/test/pamsumm.test
index 5b4fdb17..eb41ee36 100755
--- a/test/pamsumm.test
+++ b/test/pamsumm.test
@@ -1,39 +1,34 @@
-#! /bin/bash
+#! /bin/sh
 # This script tests: pamsumm
 # Also requires:
 
-echo "Test 1"
+echo "Test 1.  Should print in order: 56, 0, 1, 0.250000"
 
 for type in -sum -min -max -mean
   do
   pamsumm -brief $type testgrid.pbm
   done
 
-echo "Test 2"
+echo "Test 2.  Should print in order: 1627, 0, 1, 0.483794"
 
 for type in -sum -min -max -mean
   do
-  pamsumm -brief $type testimg.ppm
+  pamsumm -brief $type maze.pbm
   done
 
+echo "Test 3.  Should print in order: 10772432, 15, 255, 106.164760"
 
-echo "Test Invalid"
+for type in -sum -min -max -mean
+  do
+  pamsumm -brief $type testimg.ppm
+  done
 
-tmpdir=${tmpdir:-/tmp}
-test_out=${tmpdir}/test_out
 
-echo 1>&2
-echo "Invalid command-line argument combinations." 1>&2
-echo "Error messages should appear below the line." 1>&2
-echo "-----------------------------------------------------------" 1>&2
+echo "Test Invalid"
 
-pamsumm -sum -min  testimg.ppm > ${test_out} || \
-   echo -n "Expected failure 1"; test -s ${test_out}; echo " "$?
-pamsumm -sum -max  testimg.ppm > ${test_out} || \
-   echo -n "Expected failure 2"; test -s ${test_out}; echo " "$?
-pamsumm -mean -max testimg.ppm > ${test_out} || \
-   echo -n "Expected failure 3"; test -s ${test_out}; echo " "$?
-pamsumm            testimg.ppm > ${test_out} || \
-   echo -n "Expected failure 4"; test -s ${test_out}; echo " "$?
+. ${srcdir}/test-invalid.inc
 
-rm ${test_out}
+invCmd "pamsumm -sum -min  testimg.ppm"
+invCmd "pamsumm -sum -max  testimg.ppm"
+invCmd "pamsumm -mean -max testimg.ppm"
+invCmd "pamsumm            testimg.ppm"