Change RSYNX_MAX_SKIPPED to RSYNC_EXPECT_SKIPPED.

diff --git a/.cirrus.yml b/.cirrus.yml
index 7842fc2edfd20bf70b2b42b80f294cc3024ffb2e..7eec572c0d8cc3bb9a19f09a0f64be17d05fa347 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -18,6 +18,6 @@ freebsd_task:
   info_script:
     - rsync --version
   test_script:
-    - RSYNC_MAX_SKIPPED=3 make check
+    - RSYNC_EXPECT_SKIPPED='acls,crtimes,default-acls' make check
   ssl_file_list_script:
     - rsync-ssl --no-motd download.samba.org::rsyncftp/ || true

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1647fd2ad81676b944fc96cfbc3098cdb8130a7e..714ffb6240684746c0bf694d923365f145ba533a 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,11 +30,11 @@ jobs:
     - name: info
       run: rsync --version
     - name: check
-      run: sudo RSYNC_MAX_SKIPPED=1 make check
+      run: sudo RSYNC_EXPECT_SKIPPED='crtimes' make check
     - name: check30
-      run: sudo RSYNC_MAX_SKIPPED=1 make check30
+      run: sudo RSYNC_EXPECT_SKIPPED='crtimes' make check30
     - name: check29
-      run: sudo RSYNC_MAX_SKIPPED=1 make check29
+      run: sudo RSYNC_EXPECT_SKIPPED='crtimes' make check29
     - name: ssl file list
       run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact

diff --git a/runtests.sh b/runtests.sh
index eb108706b2ced21a50e39130a8538d018837dbda..80790399a26f6be11c3c0f645d697ec1b233b0ee 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -226,6 +226,7 @@ if [ ! -d "$srcdir" ]; then
     exit 2
 fi
 
+skipped_list=''
 skipped=0
 missing=0
 passed=0
@@ -265,10 +266,12 @@ maybe_discard_scratch() {
 
 if [ "x$whichtests" = x ]; then
     whichtests="*.test"
+    full_run=yes
+else
+    full_run=no
 fi
 
-for testscript in $suitedir/$whichtests
-do
+for testscript in $suitedir/$whichtests; do
     testbase=`echo $testscript | sed -e 's!.*/!!' -e 's/.test\$//'`
     scratchdir="$scratchbase/$testbase"
 
@@ -306,6 +309,7 @@ do
        # backticks will fill the whole file onto one line, which is a feature
        whyskipped=`cat "$scratchdir/whyskipped"`
        echo "SKIP    $testbase ($whyskipped)"
+       skipped_list="$skipped_list,$testbase"
        skipped=`expr $skipped + 1`
        maybe_discard_scratch
        ;;
@@ -339,8 +343,14 @@ echo '------------------------------------------------------------'
 # because -e is set.
 
 result=`expr $failed + $missing || true`
-if [ "$result" = 0 -a "$skipped" -gt "${RSYNC_MAX_SKIPPED:-9999}" ]; then
-    result=1
+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
 fi
 echo "overall result is $result"
 exit $result