streamlined tests

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

5 files changed, 27 insertions, 75 deletions

diff --git a/test/all-in-place.ok b/test/all-in-place.ok
index 29d4eb4d..2fe1ed52 100644
--- a/test/all-in-place.ok
+++ b/test/all-in-place.ok
@@ -79,6 +79,7 @@ pamsplit: ok
 pamstack: ok
 pamstereogram: ok
 pamstretch: ok
+pamstretch-gen: ok
 pamsumm: ok
 pamsummcol: ok
 pamthreshold: ok
@@ -204,6 +205,8 @@ pnmnorm: ok
 pnmpad: ok
 pnmpaste: ok
 pnmpsnr: ok
+pnmquant: ok
+pnmquantall: ok
 pnmremap: ok
 pnmrotate: ok
 pnmscalefixed: ok
@@ -320,9 +323,5 @@ yuvsplittoppm: ok
 yuvtoppm: ok
 yuy2topam: ok
 zeisstopnm: ok
-manweb: ok
 anytopnm: ok
-pnmquant: ok
-pnmquantall: ok
-pamstretch-gen: ok
-pcdovtoppm: ok
+manweb: ok
diff --git a/test/all-in-place.test b/test/all-in-place.test
index fc5f3afd..e372d373 100755
--- a/test/all-in-place.test
+++ b/test/all-in-place.test
@@ -121,6 +121,7 @@ ordinary_testprogs="\
   pamstack \
   pamstereogram \
   pamstretch \
+  pamstretch-gen \
   pamsumm \
   pamsummcol \
   pamthreshold \
@@ -246,6 +247,8 @@ ordinary_testprogs="\
   pnmpad \
   pnmpaste \
   pnmpsnr \
+  pnmquant \
+  pnmquantall \
   pnmremap \
   pnmrotate \
   pnmscalefixed \
@@ -377,45 +380,15 @@ for i in $ordinary_testprogs
   done
 
 
-# Test manweb which has --help.
-manweb --help > /dev/null
-    testExitStatus manweb 0 $?
-
-
-# Test anytopnm, pnmnoraw, pnmquant, pnmquantall with trivial input.
-
-$i ${tmpdir}/test.pbm > /dev/null 2> /dev/null;
-tmpdir=${tmpdir:-/tmp}
-test_pbm=${tmpdir}/test.pbm
-
-cat > ${test_pbm} <<EOF
-P1
-1 1
-1
-EOF
-
 # Anytopnm now supports --version but it delegates the report to pamtopnm.
 # It fails if pamtopnm is absent.
 # We consider anytopnm too important to test in an indirect manner.
 
-anytopnm ${tmpdir}/test.pbm > /dev/null 2> /dev/null;
+anytopnm testgrid.pbm > /dev/null 2> /dev/null;
 testExitStatus anytopnm 0 $?
 
-# Likewise pnmquant and pnmquantall support --version but we test them
-# by running them with actual input.
-for i in pnmquant pnmquantall
-  do
-    $i 2 ${tmpdir}/test.pbm > /dev/null 2> /dev/null;
-    testExitStatus $i 0 $?
-  done
 
+# Test manweb which has --help.
 
-# Test pamstretch-gen and pcdovtoppm with no input.
-# These two programs write a usage message on stdout when there is no input.
-# Exit status should be 1.
-
-for i in pamstretch-gen pcdovtoppm
-  do
-     $i > /dev/null
-     testExitStatus $i 1 $?
-  done
+manweb --help > /dev/null
+    testExitStatus manweb 0 $?
diff --git a/test/legacy-names.ok b/test/legacy-names.ok
index d47c7754..94ef875f 100644
--- a/test/legacy-names.ok
+++ b/test/legacy-names.ok
@@ -4,6 +4,7 @@ icontopbm: ok
 pamfixtrunc: ok
 pamrgbatopng: ok
 pbmtoicon: ok
+pbmtox10bm: ok
 pgmcrater: ok
 pgmedge: ok
 pgmnorm: ok
@@ -18,21 +19,21 @@ pnmenlarge: ok
 pnmfile: ok
 pnmflip: ok
 pnminterp: ok
+pnmnoraw: ok
 pnmscale: ok
 pnmsplit: ok
 pnmtofits: ok
+pnmtoplainpnm: ok
 pnmtopnm: ok
 pnmtotiff: ok
 ppmnorm: ok
+ppmquant: ok
+ppmquantall: ok
 ppmtogif: ok
 ppmtojpeg: ok
 ppmtomap: ok
 ppmtompeg: ok
 ppmtotga: ok
 ppmtouil: ok
-pbmtox10bm: ok
-pnmnoraw: ok
-pnmtoplainpnm: ok
-ppmquant: ok
-ppmquantall: ok
 hpcdtoppm: ok
+pcdovtoppm: ok
diff --git a/test/legacy-names.test b/test/legacy-names.test
index 406f1d4c..30509d20 100755
--- a/test/legacy-names.test
+++ b/test/legacy-names.test
@@ -61,6 +61,7 @@ ordinary_testprogs="\
   pamfixtrunc \
   pamrgbatopng \
   pbmtoicon \
+  pbmtox10bm \
   pgmcrater \
   pgmedge \
   pgmnorm \
@@ -75,12 +76,16 @@ ordinary_testprogs="\
   pnmfile \
   pnmflip \
   pnminterp \
+  pnmnoraw \
   pnmscale \
   pnmsplit \
   pnmtofits \
+  pnmtoplainpnm \
   pnmtopnm \
   pnmtotiff \
   ppmnorm \
+  ppmquant \
+  ppmquantall \
   ppmtogif \
   ppmtojpeg \
   ppmtomap \
@@ -100,36 +105,10 @@ for i in $ordinary_testprogs
 
 
 
-# Test pbmtox10bm, pnmnoraw, pnmtoplainpnm, ppmquantall
-# with trivial input.
-
-$i ${tmpdir}/test.pbm > /dev/null 2> /dev/null;
-tmpdir=${tmpdir:-/tmp}
-test_pbm=${tmpdir}/test.pbm
-
-cat > ${test_pbm} <<EOF
-P1
-1 1
-1
-EOF
-
-for i in pbmtox10bm pnmnoraw pnmtoplainpnm
-  do
-    $i ${tmpdir}/test.pbm > /dev/null 2> /dev/null;
-    testExitStatus $i 0 $?
-  done
-
-for i in ppmquant ppmquantall
-  do
-    $i 2 ${tmpdir}/test.pbm > /dev/null 2> /dev/null;
-    testExitStatus $i 0 $?
-  done
-
-
-rm ${test_pbm}
-
-
-# Test hpcdtoppm.  Simply confirm its existence.
+# Test hpcdtoppm and pcdovtoppm.  Simply confirm their existence.
 
 type -p hpcdtoppm > /dev/null
 testExitStatus hpcdtoppm 0 $?
+
+type -p pcdovtoppm > /dev/null
+testExitStatus pcdovtoppm 0 $?
diff --git a/test/ppmchange.test b/test/ppmchange.test
index d29a699f..397b290f 100755
--- a/test/ppmchange.test
+++ b/test/ppmchange.test
@@ -5,7 +5,7 @@
 
 #  Failure message
 ## If this test fails and ppmchange-roundtrip.test succeeds,
-## the probably cause is a problem with one of the options of
+## the probable cause is a problem with one of the options of
 ## ppmchange: -closeness or -remainder.
 
 tmpdir=${tmpdir:-/tmp}