From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 3 Oct 2022 08:26:30 +0000 (+0200)
Subject: - Fix test tdir skip report printout.
X-Git-Tag: release-1.17.0rc1~16
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9842fbf7602875b15de63aefc9ddce3278537877;p=thirdparty%2Funbound.git

- Fix test tdir skip report printout.
---

diff --git a/doc/Changelog b/doc/Changelog
index 2c9ed1aba..2044e1b43 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 3 October 2022: Wouter
 	- Fix to remove erroneous TC flag from TCP upstream.
+	- Fix test tdir skip report printout.
 
 26 September 2022: George
 	- Better output for skipped tdir tests.
diff --git a/testcode/mini_tdir.sh b/testcode/mini_tdir.sh
index 46914b38a..3b0719369 100755
--- a/testcode/mini_tdir.sh
+++ b/testcode/mini_tdir.sh
@@ -56,7 +56,7 @@ if test "$1" = "-f" && test "$2" = "report"; then
 			fi
 		elif test -f ".skip-$name"; then
 			echo ".. SKIPPED.. $timelen $name: $desc"
-			skip=`expr $pass + 1`
+			skip=`expr $skip + 1`
 		else
 			if test -f "result.$name"; then
 				echo "!! FAILED !! $timelen $name: $desc"
@@ -92,7 +92,9 @@ if test "$1" = "report" || test "$2" = "report"; then
 			if test -f "result.$name"; then
 				echo "!! FAILED !! : $name"
 			else
-				echo ".. SKIPPED.. : $name"
+				if test $quiet = 0; then
+					echo ".. SKIPPED.. : $name"
+				fi
 			fi
 		fi
 	done