[cups.bugs] [MOD] STR #3729: -q options not always present with Solaris

[John Adams]

DO NOT REPLY TO THIS MESSAGE.  INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.

[STR New]

Here's what we did to get to an acceptable state with make clean on our
Solaris 10 Update 9 with 10/2010 critical patches applied.

I did this to ppdc/Makefile:

        #if diff -qr ppd ppd2; then \
        if diff -r ppd ppd2; then \

I've also done this to ./test/5.9-lpinfo.sh:

#echo "    lpinfo -m | grep -q sample.drv"
#../systemv/lpinfo -m | grep -q sample.drv 2>&1
echo "    lpinfo -m | grep sample.drv"
.../systemv/lpinfo -m | grep sample.drv 2>&1

And these two things to ./test/run-stp-tests.sh:

#if grep -q CUPS-Get-Default /tmp/cups-$user/log/access_log; then
if grep CUPS-Get-Default /tmp/cups-$user/log/access_log; then

#if grep -iq 'testfile.pdf na_letter_8.5x11in'
/tmp/cups-$user/log/page_log; then
if grep -i 'testfile.pdf na_letter_8.5x11in' /tmp/cups-$user/log/page_log;
then

Note that /usr/xpg4/bin/grep (which we do not normally put into our path)
does accept the -q option, even though /usr/bin/grep does not.

I do not find a version of diff which accepts the -q option.

Link: http://www.cups.org/str.php?L3729
Version: 1.4.5