Slight fixes for changes in previous update to tests

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

3 files changed, 146 insertions, 145 deletions

diff --git a/test/pamarith.test b/test/pamarith.test
index db4a2311..b7fe3212 100755
--- a/test/pamarith.test
+++ b/test/pamarith.test
@@ -123,135 +123,135 @@ echo "-----------------------------------------------------------" 1>&2
 
 echo "Test Invalid"
 
-output_ppm=${tmpdir}/output.ppm
+test_out=${tmpdir}/test_out
 
 # multiple functions
 
-pamarith -add -subtract testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -add -subtract testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 1"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -multiply -divide testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -multiply -divide testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 2"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -difference -minimum testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -difference -minimum testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 3"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -maximum -mean testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -maximum -mean testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 4"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -compare -and testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -compare -and testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 5"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -compare -equal testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -compare -equal testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 6"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -or -nand testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -or -nand testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 7"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -nor -xor testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -nor -xor testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 8"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -shiftleft -shiftright testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -shiftleft -shiftright testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 9"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # -add does not take a value
 
-pamarith -add=1 testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -add=1 testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 10"
- test -s ${output_ppm}; echo " "$?
+ test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # No function
 
-pamarith -plain testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -plain testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 11"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 12"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # Just one input image file
 
-pamarith -add testimg.ppm > ${output_ppm} || \
+pamarith -add testimg.ppm > ${test_out} || \
   echo -n "Expected failure 13"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # No input image file
 
-pamarith -add > ${output_ppm} || \
+pamarith -add > ${test_out} || \
   echo -n "Expected failure 14"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # Input images with different depth (number of planes)
 
 pamchannel -infile testimg.ppm 0 1 | \
-  pamarith -add testimg.ppm - > ${output_ppm} || \
+  pamarith -add testimg.ppm - > ${test_out} || \
   echo -n "Expected failure 15"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # Input images with different x/y dimensions
 
-pamarith -add testimg.ppm testgrid.pbm > ${output_ppm} || \
+pamarith -add testimg.ppm testgrid.pbm > ${test_out} || \
   echo -n "Expected failure 16"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 pamenlarge -xscale=2 testgrid.pbm | \
-  pamarith -add testgrid.pbm - > ${output_ppm} || \
+  pamarith -add testgrid.pbm - > ${test_out} || \
   echo -n "Expected failure 17"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 pamenlarge -yscale=3 testgrid.pbm | \
-  pamarith -add testgrid.pbm - > ${output_ppm} || \
+  pamarith -add testgrid.pbm - > ${test_out} || \
   echo -n "Expected failure 18"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # Invalid usage of -closeness
 
-pamarith -equal -closeness=100.1 testgrid.pbm > ${output_ppm} || \
+pamarith -equal -closeness=100.1 testgrid.pbm > ${test_out} || \
   echo -n "Expected failure 19"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -equal -closeness=-10 testgrid.pbm > ${output_ppm} || \
+pamarith -equal -closeness=-10 testgrid.pbm > ${test_out} || \
   echo -n "Expected failure 20"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -closeness -equal testgrid.pbm > ${output_ppm} || \
+pamarith -closeness -equal testgrid.pbm > ${test_out} || \
   echo -n "Expected failure 21"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -compare -closeness=10 testgrid.pbm > ${output_ppm} || \
+pamarith -compare -closeness=10 testgrid.pbm > ${test_out} || \
   echo -n "Expected failure 22"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # Bit string functions
@@ -267,66 +267,66 @@ pgmmake -maxval=8191 1.0 3 1 > ${input5_pgm}
 
 # Bit string functions - Maxval must match
 
-pamarith -and ${input3_pgm} ${input5_pgm} > ${output_ppm} || \
+pamarith -and ${input3_pgm} ${input5_pgm} > ${test_out} || \
   echo -n "Expected failure 23"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -or ${input3_pgm} ${input5_pgm} > ${output_ppm} || \
+pamarith -or ${input3_pgm} ${input5_pgm} > ${test_out} || \
   echo -n "Expected failure 24"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -nand ${input3_pgm} ${input5_pgm} > ${output_ppm} || \
+pamarith -nand ${input3_pgm} ${input5_pgm} > ${test_out} || \
   echo -n "Expected failure 25"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -nor ${input3_pgm} ${input5_pgm} > ${output_ppm} || \
+pamarith -nor ${input3_pgm} ${input5_pgm} > ${test_out} || \
   echo -n "Expected failure 26"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -xor ${input3_pgm} ${input5_pgm} > ${output_ppm} || \
+pamarith -xor ${input3_pgm} ${input5_pgm} > ${test_out} || \
   echo -n "Expected failure 27"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 # Bit string functions - Maxval must be 2^n -1
 
-pamarith -and ${input4_pgm} ${input4_pgm} > ${output_ppm} || \
+pamarith -and ${input4_pgm} ${input4_pgm} > ${test_out} || \
   echo -n "Expected failure 28"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -or ${input4_pgm} ${input4_pgm} > ${output_ppm} || \
+pamarith -or ${input4_pgm} ${input4_pgm} > ${test_out} || \
   echo -n "Expected failure 29"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -nand ${input4_pgm} ${input4_pgm} > ${output_ppm} || \
+pamarith -nand ${input4_pgm} ${input4_pgm} > ${test_out} || \
   echo -n "Expected failure 30"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -nor ${input4_pgm} ${input4_pgm} > ${output_ppm} || \
+pamarith -nor ${input4_pgm} ${input4_pgm} > ${test_out} || \
   echo -n "Expected failure 31"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -xor ${input4_pgm} ${input4_pgm} > ${output_ppm} || \
+pamarith -xor ${input4_pgm} ${input4_pgm} > ${test_out} || \
   echo -n "Expected failure 32"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -shiftleft ${input4_pgm} ${input4_pgm} > ${output_ppm} || \
+pamarith -shiftleft ${input4_pgm} ${input4_pgm} > ${test_out} || \
   echo -n "Expected failure 33"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -shiftright ${input4_pgm} ${input4_pgm} > ${output_ppm} || \
+pamarith -shiftright ${input4_pgm} ${input4_pgm} > ${test_out} || \
   echo -n "Expected failure 34"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
 rm ${input3_pgm} ${input4_pgm} ${input5_pgm}
@@ -335,47 +335,45 @@ rm ${input3_pgm} ${input4_pgm} ${input5_pgm}
 # Only the functions that are commutative and associative allow
 # three or more inputs.
 
-pamarith -subtract testimg.ppm testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -subtract testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 35"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -divide testimg.ppm testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -divide testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 36"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -compare testimg.ppm testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -compare testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 37"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -difference testimg.ppm testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -difference testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 38"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -shiftleft testimg.ppm testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -shiftleft testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 39"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -shiftright testimg.ppm testimg.ppm testimg.ppm > ${output_ppm} || \
+pamarith -shiftright testimg.ppm testimg.ppm testimg.ppm > ${test_out} || \
   echo -n "Expected failure 40"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   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 > ${output_ppm} || \
+pamarith -equal testgrid.pbm testgrid.pbm testgrid.pbm > ${test_out} || \
   echo -n "Expected failure 41"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamarith -mean testgrid.pbm  testgrid.pbm testgrid.pbm > ${output_ppm} || \
+pamarith -mean testgrid.pbm  testgrid.pbm testgrid.pbm > ${test_out} || \
   echo -n "Expected failure 42"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
-
-rm ${output_ppm}
diff --git a/test/pamfunc.test b/test/pamfunc.test
index fa2570b4..e52584b4 100755
--- a/test/pamfunc.test
+++ b/test/pamfunc.test
@@ -90,124 +90,124 @@ echo "-----------------------------------------------------------" 1>&2
 
 echo "Test Invalid"
 
-output_ppm=${tmpdir}/output.ppm
+test_out=${tmpdir}/test_out
 
-pamfunc -multiplier testimg.ppm > ${output_ppm} || \
+pamfunc -multiplier testimg.ppm > ${test_out} || \
   echo -n "Expected failure 1"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -multiplier=-1 testimg.ppm > ${output_ppm} || \
+pamfunc -multiplier=-1 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 2"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -divisor testimg.ppm > ${output_ppm} || \
+pamfunc -divisor testimg.ppm > ${test_out} || \
   echo -n "Expected failure 3"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -divisor=-20 testimg.ppm > ${output_ppm} || \
+pamfunc -divisor=-20 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 4"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -adder testimg.ppm > ${output_ppm} || \
+pamfunc -adder testimg.ppm > ${test_out} || \
   echo -n "Expected failure 5"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -adder 0.5 testimg.ppm > ${output_ppm} || \
+pamfunc -adder 0.5 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 6"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -subtractor testimg.ppm > ${output_ppm} || \
+pamfunc -subtractor testimg.ppm > ${test_out} || \
   echo -n "Expected failure 7"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -subtractor 0.1 testimg.ppm > ${output_ppm} || \
+pamfunc -subtractor 0.1 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 8"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -multiplier=1 -divisor=2 testimg.ppm > ${output_ppm} || \
+pamfunc -multiplier=1 -divisor=2 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 9"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -adder=2 -subtractor=3 testimg.ppm > ${output_ppm} || \
+pamfunc -adder=2 -subtractor=3 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 10"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -min testimg.ppm > ${output_ppm} || \
+pamfunc -min testimg.ppm > ${test_out} || \
   echo -n "Expected failure 11"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -max testimg.ppm > ${output_ppm} || \
+pamfunc -max testimg.ppm > ${test_out} || \
   echo -n "Expected failure 12"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -andmask testimg.ppm > ${output_ppm} || \
+pamfunc -andmask testimg.ppm > ${test_out} || \
   echo -n "Expected failure 13"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -ormask testimg.ppm > ${output_ppm} || \
+pamfunc -ormask testimg.ppm > ${test_out} || \
   echo -n "Expected failure 14"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -xormask testimg.ppm > ${output_ppm} || \
+pamfunc -xormask testimg.ppm > ${test_out} || \
   echo -n "Expected failure 15"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -not 1 testimg.ppm > ${output_ppm} || \
+pamfunc -not 1 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 16"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -min=1 -max=2 testimg.ppm > ${output_ppm} || \
+pamfunc -min=1 -max=2 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 17"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -andmask=1 -ormask=0 testimg.ppm > ${output_ppm} || \
+pamfunc -andmask=1 -ormask=0 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 18"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -andmask=0xffff testimg.ppm > ${output_ppm} || \
+pamfunc -andmask=0xffff testimg.ppm > ${test_out} || \
   echo -n "Expected failure 19"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -shiftleft testimg.ppm > ${output_ppm} || \
+pamfunc -shiftleft testimg.ppm > ${test_out} || \
   echo -n "Expected failure 20"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -shiftright testimg.ppm > ${output_ppm} || \
+pamfunc -shiftright testimg.ppm > ${test_out} || \
   echo -n "Expected failure 21"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -changemaxval testimg.ppm > ${output_ppm} || \
+pamfunc -changemaxval testimg.ppm > ${test_out} || \
   echo -n "Expected failure 22"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -shiftleft=1 -shiftright=1 testimg.ppm > ${output_ppm} || \
+pamfunc -shiftleft=1 -shiftright=1 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 23"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
 
-pamfunc -multiplier=0.5 -changemaxval=65535 testimg.ppm > ${output_ppm} || \
+pamfunc -multiplier=0.5 -changemaxval=65535 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 24"
-  test -s ${output_ppm}; echo " "$?
+  test -s ${test_out}; echo " "$?
   rm -f ${test_out}
diff --git a/test/pamrecolor.test b/test/pamrecolor.test
index 3f21517a..67c6f19d 100755
--- a/test/pamrecolor.test
+++ b/test/pamrecolor.test
@@ -26,34 +26,37 @@ echo "Invalid command-line argument combinations." 1>&2
 echo "Error messages should appear below the line." 1>&2
 echo "-----------------------------------------------------------" 1>&2
 
-pamrecolor --targetcolor=rgb:00/11/22 --colorfile={base1_pgm} testimg.ppm > ${test_out} || \
+pamrecolor --targetcolor=rgb:00/11/22 \
+           --colorfile=${base1_pgm} testimg.ppm > ${test_out} || \
   echo -n "Expected failure 1"
   test -s ${test_out}; echo " "$?
-  rm -f {test_out}
+  rm -f ${test_out}
 
-pamrecolor --rmult=0.3  --gmult=0.3  --bmult=0.3 --colorfile={base1_pgm} testimg.ppm > ${test_out} || \
+pamrecolor --rmult=0.3  --gmult=0.3  --bmult=0.3 \
+           --colorfile=${base1_pgm} testimg.ppm > ${test_out} || \
   echo -n "Expected failure 2"
   test -s ${test_out}; echo " "$?
-  rm -f {test_out}
+  rm -f ${test_out}
 
-pamrecolor --colorspace=void --targetcolor=rgb:80/80/80 testimg.ppm > ${test_out} || \
+pamrecolor --colorspace=void \
+           --targetcolor=rgb:80/80/80 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 3"
   test -s ${test_out}; echo " "$?
-  rm -f {test_out}
+  rm -f ${test_out}
 
 pamrecolor --targetcolor=vague testimg.ppm > ${test_out} || \
   echo -n "Expected failure 4"
   test -s ${test_out}; echo " "$?
-  rm -f {test_out}
+  rm -f ${test_out}
 
 pamrecolor --colorfile=${truncated_file} testimg.ppm > ${test_out} || \
   echo -n "Expected failure 5"
   test -s ${test_out}; echo " "$?
-  rm -f {test_out}
+  rm -f ${test_out}
 
 pamrecolor --rmult=0.2989 --gmult=0.5866 testimg.ppm > ${test_out} || \
   echo -n "Expected failure 6"
   test -s ${test_out}; echo " "$?
-  rm -f {test_out}
+  rm -f ${test_out}
 
 rm ${base_pgm} ${truncated_file}