From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Thu, 12 Oct 2017 18:27:18 +0000 (-0400)
Subject: Fix "make check" for restricted environments (Issue #5099)
X-Git-Tag: v2.2.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=979804902ca385a6ba31a42ffac8dae05ee3ca22;p=thirdparty%2Fcups.git

Fix "make check" for restricted environments (Issue #5099)
---

diff --git a/CHANGES.md b/CHANGES.md
index 39cceba2a4..07031c6f32 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -37,6 +37,7 @@ CHANGES IN CUPS V2.2.5
   choosing them for draft, normal, and best quality modes (Issue #5091)
 - Fixed the localization unit test on Linux (Issue #5097)
 - The CUPS library did not reuse domain sockets (Issue #5098)
+- Fixed the "make check" target for some environments (Issue #5099)
 - The scheduler woke up once per second to remove old temporary queues
   (Issue #5100)
 - Added USB quirk rule for Kyocera printer (Issue #5102, Issue #5103)
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 37604a9aa4..41dace7c98 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -996,7 +996,7 @@ else
 fi
 
 # Error log messages
-count=`$GREP '^E ' $BASE/log/error_log | wc -l | awk '{print $1}'`
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
 if test $count != 33; then
 	echo "FAIL: $count error messages, expected 33."
 	$GREP '^E ' $BASE/log/error_log