Add tiffcmyk test, improve ppmpat, tiff roundtrip test

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

1 files changed, 16 insertions, 5 deletions

diff --git a/test/legacy-names.test b/test/legacy-names.test
index 46bc9ee4..5a65615f 100755
--- a/test/legacy-names.test
+++ b/test/legacy-names.test
@@ -94,6 +94,13 @@ ordinary_testprogs="\
   ppmtouil \
 "
 
+# Switch to control output from "program --version"
+# See comments in all-in-place.test
+
+if [ ${CHECK_TYPE} = "install" ]
+  then grepOption[1]="" ;   # Output --version message
+  else grepOption[0]="-v" ; # Suppress output
+fi
 
 for i in $ordinary_testprogs
   do
@@ -105,11 +112,15 @@ for i in $ordinary_testprogs
       continue
       fi
 
-    $i --version  2>&1 | \
-    egrep -v \
-    "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
-      1>&2;
-    testExitStatus $i 0 ${PIPESTATUS[0]}
+    $i --version < /dev/null 2>&1 | \
+    egrep -v -e "fiascotopnm" -e \
+    ": ((BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" | \
+    egrep ${grepOption[$grepSwitch]} -e \
+    ": (Using lib(net)?pbm|(Built (by|at)|Compiled ))" 1>&2;
+    # See showVersion() in lib/libpm.c for the above regular expressions.
+  
+    exitStatus=${PIPESTATUS[0]}
+    testExitStatus $i 0 ${exitStatus}
   done