diff options
Diffstat (limited to 'test/pamarith.test')
| -rwxr-xr-x | test/pamarith.test | 168 |
1 files changed, 84 insertions, 84 deletions
diff --git a/test/pamarith.test b/test/pamarith.test index 061f9488..03ce7317 100755 --- a/test/pamarith.test +++ b/test/pamarith.test @@ -127,130 +127,130 @@ test_out=${tmpdir}/test_out # multiple functions pamarith -add -subtract testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 1" - test -s ${test_out}; echo " "$? + printf "Expected failure 1 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -multiply -divide testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 2" - test -s ${test_out}; echo " "$? + printf "Expected failure 2 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -difference -minimum testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 3" - test -s ${test_out}; echo " "$? + printf "Expected failure 3 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -maximum -mean testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 4" - test -s ${test_out}; echo " "$? + printf "Expected failure 4 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -compare -and testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 5" - test -s ${test_out}; echo " "$? + printf "Expected failure 5 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -compare -equal testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 6" - test -s ${test_out}; echo " "$? + printf "Expected failure 6 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -or -nand testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 7" - test -s ${test_out}; echo " "$? + printf "Expected failure 7 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -nor -xor testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 8" - test -s ${test_out}; echo " "$? + printf "Expected failure 8 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -shiftleft -shiftright testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 9" - test -s ${test_out}; echo " "$? + printf "Expected failure 9 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # -add does not take a value pamarith -add=1 testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 10" - test -s ${test_out}; echo " "$? + printf "Expected failure 10 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # No function pamarith -plain testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 11" - test -s ${test_out}; echo " "$? + printf "Expected failure 11 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 12" - test -s ${test_out}; echo " "$? + printf "Expected failure 12 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # Just one input image file pamarith -add testimg.ppm > ${test_out} || \ - printf "Expected failure 13" - test -s ${test_out}; echo " "$? + printf "Expected failure 13 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # No input image file pamarith -add > ${test_out} || \ - printf "Expected failure 14" - test -s ${test_out}; echo " "$? + printf "Expected failure 14 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # Input images with different depth (number of planes) pamchannel -infile testimg.ppm 0 1 | \ pamarith -add testimg.ppm - > ${test_out} || \ - printf "Expected failure 15" - test -s ${test_out}; echo " "$? + printf "Expected failure 15 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # Input images with different x/y dimensions pamarith -add testimg.ppm testgrid.pbm > ${test_out} || \ - printf "Expected failure 16" - test -s ${test_out}; echo " "$? + printf "Expected failure 16 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamenlarge -xscale=2 testgrid.pbm | \ pamarith -add testgrid.pbm - > ${test_out} || \ - printf "Expected failure 17" - test -s ${test_out}; echo " "$? + printf "Expected failure 17 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamenlarge -yscale=3 testgrid.pbm | \ pamarith -add testgrid.pbm - > ${test_out} || \ - printf "Expected failure 18" - test -s ${test_out}; echo " "$? + printf "Expected failure 18 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # Invalid usage of -closeness pamarith -equal -closeness=100.1 testgrid.pbm > ${test_out} || \ - printf "Expected failure 19" - test -s ${test_out}; echo " "$? + printf "Expected failure 19 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -equal -closeness=-10 testgrid.pbm > ${test_out} || \ - printf "Expected failure 20" - test -s ${test_out}; echo " "$? + printf "Expected failure 20 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -closeness -equal testgrid.pbm > ${test_out} || \ - printf "Expected failure 21" - test -s ${test_out}; echo " "$? + printf "Expected failure 21 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -compare -closeness=10 testgrid.pbm > ${test_out} || \ - printf "Expected failure 22" - test -s ${test_out}; echo " "$? + printf "Expected failure 22 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # Bit string functions @@ -267,65 +267,65 @@ pgmmake -maxval=8191 1.0 3 1 > ${input5_pgm} # Bit string functions - Maxval must match pamarith -and ${input3_pgm} ${input5_pgm} > ${test_out} || \ - printf "Expected failure 23" - test -s ${test_out}; echo " "$? + printf "Expected failure 23 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -or ${input3_pgm} ${input5_pgm} > ${test_out} || \ - printf "Expected failure 24" - test -s ${test_out}; echo " "$? + printf "Expected failure 24 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -nand ${input3_pgm} ${input5_pgm} > ${test_out} || \ - printf "Expected failure 25" - test -s ${test_out}; echo " "$? + printf "Expected failure 25 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -nor ${input3_pgm} ${input5_pgm} > ${test_out} || \ - printf "Expected failure 26" - test -s ${test_out}; echo " "$? + printf "Expected failure 26 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -xor ${input3_pgm} ${input5_pgm} > ${test_out} || \ - printf "Expected failure 27" - test -s ${test_out}; echo " "$? + printf "Expected failure 27 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # Bit string functions - Maxval must be 2^n -1 pamarith -and ${input4_pgm} ${input4_pgm} > ${test_out} || \ - printf "Expected failure 28" - test -s ${test_out}; echo " "$? + printf "Expected failure 28 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -or ${input4_pgm} ${input4_pgm} > ${test_out} || \ - printf "Expected failure 29" - test -s ${test_out}; echo " "$? + printf "Expected failure 29 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -nand ${input4_pgm} ${input4_pgm} > ${test_out} || \ - printf "Expected failure 30" - test -s ${test_out}; echo " "$? + printf "Expected failure 30 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -nor ${input4_pgm} ${input4_pgm} > ${test_out} || \ - printf "Expected failure 31" - test -s ${test_out}; echo " "$? + printf "Expected failure 31 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -xor ${input4_pgm} ${input4_pgm} > ${test_out} || \ - printf "Expected failure 32" - test -s ${test_out}; echo " "$? + printf "Expected failure 32 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -shiftleft ${input4_pgm} ${input4_pgm} > ${test_out} || \ - printf "Expected failure 33" - test -s ${test_out}; echo " "$? + printf "Expected failure 33 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -shiftright ${input4_pgm} ${input4_pgm} > ${test_out} || \ - printf "Expected failure 34" - test -s ${test_out}; echo " "$? + printf "Expected failure 34 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} rm ${input3_pgm} ${input4_pgm} ${input5_pgm} @@ -335,44 +335,44 @@ rm ${input3_pgm} ${input4_pgm} ${input5_pgm} # three or more inputs. pamarith -subtract testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 35" - test -s ${test_out}; echo " "$? + printf "Expected failure 35 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -divide testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 36" - test -s ${test_out}; echo " "$? + printf "Expected failure 36 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -compare testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 37" - test -s ${test_out}; echo " "$? + printf "Expected failure 37 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -difference testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 38" - test -s ${test_out}; echo " "$? + printf "Expected failure 38 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -shiftleft testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 39" - test -s ${test_out}; echo " "$? + printf "Expected failure 39 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -shiftright testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \ - printf "Expected failure 40" - test -s ${test_out}; echo " "$? + printf "Expected failure 40 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} # Currently -equal and -mean do not allow more than two input images. # These two cases should be removed once improvements are made. pamarith -equal testgrid.pbm testgrid.pbm testgrid.pbm > ${test_out} || \ - printf "Expected failure 41" - test -s ${test_out}; echo " "$? + printf "Expected failure 41 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} pamarith -mean testgrid.pbm testgrid.pbm testgrid.pbm > ${test_out} || \ - printf "Expected failure 42" - test -s ${test_out}; echo " "$? + printf "Expected failure 42 " + test -s ${test_out} && echo "unexpected output" || echo "(no output)" rm -f ${test_out} |