From: Wayne Davison <wayne@opencoder.net>
Date: Sun, 17 Oct 2021 18:56:58 +0000 (-0700)
Subject: Tweak output about skipped tests.
X-Git-Tag: v3.2.4pre1~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac08fa74f37a74d8d162b7fb806ff3fee67124d8;p=thirdparty%2Frsync.git

Tweak output about skipped tests.
---

diff --git a/runtests.sh b/runtests.sh
index 80790399..38f814d2 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -226,6 +226,7 @@ if [ ! -d "$srcdir" ]; then
     exit 2
 fi
 
+expect_skipped="${RSYNC_EXPECT_SKIPPED-IGNORE}"
 skipped_list=''
 skipped=0
 missing=0
@@ -335,6 +336,15 @@ echo "      $passed passed"
 [ "$failed" -gt 0 ]  && echo "      $failed failed"
 [ "$skipped" -gt 0 ] && echo "      $skipped skipped"
 [ "$missing" -gt 0 ] && echo "      $missing missing"
+if [ "$full_run" = yes -a "$expect_skipped" != IGNORE ]; then
+    skipped_list=`echo "$skipped_list" | sed 's/^,//'`
+    echo "----- skipped results:"
+    echo "      expected: $expect_skipped"
+    echo "      got:      $skipped_list"
+else
+    skipped_list=''
+    expect_skipped=''
+fi
 echo '------------------------------------------------------------'
 
 # OK, so expr exits with 0 if the result is neither null nor zero; and
@@ -343,14 +353,8 @@ echo '------------------------------------------------------------'
 # because -e is set.
 
 result=`expr $failed + $missing || true`
-if [ "$result$full_run" = 0yes ]; then
-    expect_skipped="${RSYNC_EXPECT_SKIPPED:-IGNORE}"
-    skipped_list=`echo "$skipped_list" | sed 's/^,//'`
-    if [ "$expect_skipped" != IGNORE -a "$skipped_list" != "$expect_skipped" ]; then
-	echo "Skips expected: $expect_skipped"
-	echo "Skips got:      $skipped_list"
-	result=1
-    fi
+if [ "$result" = 0 -a "$skipped_list" != "$expect_skipped" ]; then
+    result=1
 fi
 echo "overall result is $result"
 exit $result