← Back to branch summary

~ubuntu-branches/ubuntu/wily/cups/wily

« back to all changes in this revision

Viewing changes to debian/patches/tests-ignore-warnings.patch

  • Committer: Package Import Robot
  • Author(s): Didier Raboud
  • Date: 2013-05-03 11:30:59 UTC
  • mfrom: (100.1.11 experimental)
  • Revision ID: package-import@ubuntu.com-20130503113059-u4vwqd3op51vu7o7
Update the patch adding libusb error handling to also discard its
errors in the counting of warning messages; this should make the
error-suite succeed in more cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/tests-ignore-warnings.patch
7
7
 fi
8
8
 
9
9
 # Warning log messages
10
 
-count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'`
11
 
+count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'org.freedesktop.ColorManager' | grep -v -E 'Avahi client failed: -(1|26)' | wc -l | awk '{print $1}'`
 
10
-count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | wc -l | awk '{print $1}'`
 
11
+count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | grep -v 'org.freedesktop.ColorManager' | grep -v -E 'Avahi client failed: -(1|26)' | wc -l | awk '{print $1}'`
12
12
 if test $count != 9; then
13
13
        echo "FAIL: $count warning messages, expected 9."
14
14
        $GREP '^W ' /tmp/cups-$user/log/error_log