From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 9 Jan 2019 19:10:38 +0000 (-0500)
Subject: Don't expect debug2 messages when we run the "deeper" test sets.
X-Git-Tag: v2.3b8~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c715f67b5575d62581e8ad3bb8bcb75b93a474e2;p=thirdparty%2Fcups.git

Don't expect debug2 messages when we run the "deeper" test sets.
---

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 92c6eb4de4..fb53bc97fc 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1027,10 +1027,14 @@ fi
 
 # Debug2 log messages
 count=`$GREP '^d ' $BASE/log/error_log | wc -l | awk '{print $1}'`
-if test $count = 0; then
+if test $count = 0 -a $loglevel = debug2; then
 	echo "FAIL: $count debug2 messages, expected more than 0."
 	echo "    <p>FAIL: $count debug2 messages, expected more than 0.</p>" >>$strfile
 	fail=`expr $fail + 1`
+elif test $count != 0 -a $loglevel = debug; then
+	echo "FAIL: $count debug2 messages, expected 0."
+	echo "    <p>FAIL: $count debug2 messages, expected 0.</p>" >>$strfile
+	fail=`expr $fail + 1`
 else
 	echo "PASS: $count debug2 messages."
 	echo "    <p>PASS: $count debug2 messages.</p>" >>$strfile