diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-06-30 03:27:10 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-06-30 03:27:10 +0000 |
commit | 08d938dc6fc6b30e5da6733b52c97169c0d24f8a (patch) | |
tree | 92673cd6a5755fc209078cc6b6a42602defc0212 /test/all-in-place.test | |
parent | e21f4e95d897c93a4779bf78c71f1341d164a222 (diff) | |
download | netpbm-mirror-08d938dc6fc6b30e5da6733b52c97169c0d24f8a.tar.gz netpbm-mirror-08d938dc6fc6b30e5da6733b52c97169c0d24f8a.tar.xz netpbm-mirror-08d938dc6fc6b30e5da6733b52c97169c0d24f8a.zip |
Copy Development as new Advanced
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3018 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'test/all-in-place.test')
-rwxr-xr-x | test/all-in-place.test | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/test/all-in-place.test b/test/all-in-place.test index 1cdae7f6..52d38bcf 100755 --- a/test/all-in-place.test +++ b/test/all-in-place.test @@ -124,6 +124,7 @@ ordinary_testprogs="\ pamstretch-gen \ pamsumm \ pamsummcol \ + pamtable \ pamthreshold \ pamtilt \ pamtoavs \ @@ -368,9 +369,17 @@ ordinary_testprogs="\ " -# The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm +# The string "fiascotopnm" has to be filtered out by fgrep for fiascotopnm # has a slightly different version report format. +# Switch to control output from "program --version" +# +grepSwitch=1 # Initial value + # Always 1 for check-install, + # otherwise changes to 0 once a command succeeds. +grepOption[0]="-v" # Suppress output +grepOption[1]="" # Output --version message + for i in $ordinary_testprogs do # Stub out programs that aren't built. @@ -381,11 +390,24 @@ for i in $ordinary_testprogs continue fi - $i --version 2>&1 | \ - egrep -v -e fiascotopnm -e \ - "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \ - 1>&2; - testExitStatus $i 0 ${PIPESTATUS[0]} + + $i --version < /dev/null 2>&1 | \ + # Older versions of pamstretch-gen and ppmshadow (encountered when + # one does "make check-install") get stuck when there is no input. + # Supply /dev/null as input to placate these programs. + + 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} + + if [ ${CHECK_TYPE} != "install" ] + then grepSwitch=$((${grepSwitch} * ${exitStatus})) ; + fi done |