From 56a04f5d453be250b79670a09c1f85d96c8d4ad6 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 9 Aug 2016 18:11:22 +0200 Subject: Force LC_ALL=C environment variable when grepping the output of lpstat. Permits testing in non-"C" environments. Origin: vendor Last-Update: 2016-07-11 Patch-Name: tests-make-lpstat-call-reproducible.patch --- test/run-stp-tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 974da77a5..10ad26495 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -703,7 +703,7 @@ else fi while true; do - running=`$runcups ../systemv/lpstat -r 2>/dev/null` + running=`LC_ALL=C $runcups ../systemv/lpstat -r 2>/dev/null` if test "x$running" = "xscheduler is running"; then break fi @@ -817,13 +817,13 @@ kill -HUP $cupsd while true; do sleep 10 - running=`$runcups ../systemv/lpstat -r 2>/dev/null` + running=`LC_ALL=C $runcups ../systemv/lpstat -r 2>/dev/null` if test "x$running" = "xscheduler is running"; then break fi done -description="`$runcups ../systemv/lpstat -l -p Test1 | grep Description | sed -e '1,$s/^[^:]*: //g'`" +description="`LC_ALL=C $runcups ../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')"