diff options
| author | Wayne Davison <wayne@opencoder.net> | 2021-10-17 11:32:06 -0700 |
|---|---|---|
| committer | Wayne Davison <wayne@opencoder.net> | 2021-10-17 11:34:07 -0700 |
| commit | d5d4ae51ee60222033ba8fbb352a17c7491e349e (patch) | |
| tree | 6cda69bc157972c05bd45748770ea69a6a0840de | |
| parent | 0f87eafa2fa2379901762b8aa133f7074dbb2c0e (diff) | |
| download | rsync-d5d4ae51ee60222033ba8fbb352a17c7491e349e.tar.gz | |
Change RSYNX_MAX_SKIPPED to RSYNC_EXPECT_SKIPPED.
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 6 | ||||
| -rwxr-xr-x | runtests.sh | 18 |
3 files changed, 18 insertions, 8 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 7842fc2e..7eec572c 100644 --- 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 1647fd2a..714ffb62 100644 --- 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 eb108706..80790399 100755 --- 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 |