- Fix test tdir skip report printout.

diff --git a/doc/Changelog b/doc/Changelog
index 2c9ed1aba373ef2b6128a3f456b6d0fd04707418..2044e1b4324b32001681214b38f6e48393a9862a 100644 (file)
--- 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 46914b38a2ad361ddd9bb94eaf0cefa2cab3291d..3b0719369847aae41aee281178d0db64948223e0 100755 (executable)
--- 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