Make sure to run the lpstat command from the source directory.

Dummy scripts need to consume their input...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12391 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 6940e38daf00187459ba685feea66517fd5a4a9c..7708dc0791dfdcb0f0bc4029013efaaf70ecc955 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -401,6 +401,7 @@ instfilter() {
 #!/bin/sh
 trap "" TERM
 trap "" PIPE
+cat \$6 \>/dev/null
 case "\$5" in
        *media=a4* | *media=iso_a4* | *PageSize=A4*)
                cat "$root/test/onepage-a4.pdf"
@@ -417,6 +418,7 @@ EOF
 #!/bin/sh
 trap "" TERM
 trap "" PIPE
+cat \$6 \>/dev/null
 case "\$5" in
        *media=a4* | *media=iso_a4* | *PageSize=A4*)
                cat "$root/test/onepage-a4.ps"
@@ -433,6 +435,7 @@ EOF
 #!/bin/sh
 trap "" TERM
 trap "" PIPE
+cat \$6 \>/dev/null
 case "\$5" in
        *media=a4* | *media=iso_a4* | *PageSize=A4*)
                gunzip -c "$root/test/onepage-a4-300-black-1.pwg.gz"
@@ -820,7 +823,7 @@ while true; do
        fi
 done
 
-description="`lpstat -l -p Test1 | grep Description | sed -e '1,$s/^[^:]*: //g'`"
+description="`../systemv/lpstat -l -p Test1 | grep Description | sed -e '1,$s/^[^:]*: //g'`"
 if test "x$description" != "xTest Printer 1"; then
        echo "Failed, printer-info for Test1 is '$description', expected 'Test Printer 1'." >>$strfile
        echo "FAIL (got '$description', expected 'Test Printer 1')"