Skip to content

Commit 75e30b2

Browse files
committed
ci: overlay the stable testsuite instead of running it out of a second tree
The stable-testsuite job ran the newer suite via --srcdir, pointing at the v34-stable-testsuite checkout while the binary came from here. The tests resolve their fixtures relative to the tree they live in -- support/lsh.sh, support/rrsync, old_versions/ -- so that pairing handed this branch's rsync someone else's helpers and failed 94 tests for reasons unrelated to 3.2.7. Overlay the suite onto this checkout instead, which is the composition fleettest.py --testsuite-repo already builds: this branch's code, the newer suite, one tree. old_versions/ is copied rather than git-archived because its static binaries are export-ignore'd. Also point the push/PR triggers at -sec-patches3; they still named -sec-patches2, so the job had stopped firing on push entirely. partial_nowrite joins the exclude list: it covers the receiver chmod-on-denied-open behaviour added in 3.5.0, which this base does not have. With this, the full 3.5.0 suite runs clean here and the expected-skip oracle matches exactly.
1 parent 2ebd73a commit 75e30b2

2 files changed

Lines changed: 30 additions & 20 deletions

File tree

‎.github/workflows/stable-testsuite.yml‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,25 @@ name: Stable testsuite
33
# Regression coverage for this stable-backport branch. The branch keeps the old
44
# shell test suite, so the modern Python suite is maintained separately on the
55
# v34-stable-testsuite branch. This job builds rsync from this branch and runs
6-
# that suite against the freshly-built binary (the same "testsuite from one
7-
# branch, code from another" split fleettest uses). Helper programs and
8-
# config.h come from this branch's build (tooldir); the test scripts come from
9-
# the stable-testsuite checkout (--srcdir).
6+
# that suite against it.
7+
#
8+
# The suite is OVERLAID onto this checkout rather than run from its own
9+
# directory via --srcdir. The tests resolve fixtures relative to the source
10+
# tree they live in (support/lsh.sh, support/rrsync, old_versions/), so running
11+
# them out of a second tree pairs this branch's binary with the other tree's
12+
# helpers -- which fails ~90 tests for reasons that have nothing to do with this
13+
# branch. Overlaying gives one tree: this branch's code, the newer suite.
14+
# It is the same composition fleettest.py --testsuite-repo builds.
1015

1116
on:
1217
push:
13-
branches: [ v3.2.7-sec-patches2 ]
18+
branches: [ v3.2.7-sec-patches3 ]
1419
paths-ignore:
1520
- '.github/workflows/*.yml'
1621
- '!.github/workflows/stable-testsuite.yml'
1722
pull_request:
1823
types: [opened, synchronize, reopened, labeled]
19-
branches: [ v3.2.7-sec-patches2 ]
24+
branches: [ v3.2.7-sec-patches3 ]
2025
paths-ignore:
2126
- '.github/workflows/*.yml'
2227
- '!.github/workflows/stable-testsuite.yml'
@@ -47,34 +52,38 @@ jobs:
4752
ref: v34-stable-testsuite
4853
path: stable-testsuite
4954
fetch-depth: 1
55+
# Merge, never delete: testsuite/skiplist/backport.txt is ours and names the
56+
# tests this base cannot run; runtests.py reads it from the built tree.
57+
# old_versions/ holds the static peer binaries the version-mixing tests need
58+
# -- they are export-ignore'd, so they must be copied, not git-archived.
59+
- name: overlay the stable testsuite
60+
run: |
61+
cp -a stable-testsuite/runtests.py .
62+
cp -a stable-testsuite/testsuite/. testsuite/
63+
cp -a stable-testsuite/old_versions .
64+
rm -rf stable-testsuite
5065
- name: prep
5166
run: |
5267
sudo apt-get update
5368
sudo apt-get install -y gcc g++ gawk autoconf automake \
5469
acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev \
5570
python3-cmarkgfm openssl
56-
echo "/usr/local/bin" >>$GITHUB_PATH
71+
echo "/usr/local/bin" >>"$GITHUB_PATH"
5772
- name: configure
5873
run: ./configure --with-rrsync
5974
- name: make check-progs
6075
run: make check-progs
6176
- name: info
6277
run: ./rsync --version
63-
# Pipe transport (the secure stdio default). The TCP-only daemon tests
64-
# (daemon-access-ip, proxy-response-line-too-long) skip here and are run in
65-
# the --use-tcp pass below; crtimes/daemon-chroot-acl/recv-discard-nullderef
66-
# skip on the runner's filesystem / under root.
78+
# Pipe transport (the secure stdio default). The TCP-only daemon tests skip
79+
# here and are covered by the --use-tcp pass below; the platform lists carry
80+
# those names, and backport.txt (read from this tree) drops the tests this
81+
# base cannot run.
6782
- name: run stable testsuite (pipe)
6883
run: |
69-
sudo RSYNC_EXPECT_SKIPPED=crtimes,daemon-access-ip,daemon-chroot-acl,proxy-response-line-too-long,recv-discard-nullderef \
70-
./stable-testsuite/runtests.py \
71-
--srcdir="$GITHUB_WORKSPACE/stable-testsuite" \
72-
--rsync-bin="$GITHUB_WORKSPACE/rsync" \
73-
-j16
84+
sudo RSYNC_EXPECT_SKIPPED=@testsuite/skiplist/common.txt,@testsuite/skiplist/linux.txt \
85+
./runtests.py -j16
7486
# TCP transport over loopback, exercising the daemon paths the pipe run skips.
7587
- name: run stable testsuite (tcp)
7688
run: |
77-
sudo ./stable-testsuite/runtests.py \
78-
--srcdir="$GITHUB_WORKSPACE/stable-testsuite" \
79-
--rsync-bin="$GITHUB_WORKSPACE/rsync" \
80-
--use-tcp -j8
89+
sudo ./runtests.py --use-tcp -j8

‎testsuite/skiplist/backport.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ chmod-option # --chmod permission copy modes (3.5.0)
2323
preallocate # --preallocate --sparse hole punching (3.5.0)
2424
daemon-refuse-compress-threads-alias # --compress-threads arrived in 3.4.2
2525
daemon-zstd-thread-exhaustion # --compress-threads arrived in 3.4.2
26+
partial_nowrite # receiver chmod-on-denied-open (3.5.0)
2627

2728
# The suite's per-platform skip lists describe the tests IT ships, so they do
2829
# not describe a build of this branch.

0 commit comments

Comments
 (0)