mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-09-12 21:28:25 -04:00
Every branch that added a test which skips somewhere had to edit RSYNC_EXPECT_SKIPPED, a single ~3 KB YAML line duplicated across seven workflow steps -- so two such branches always conflicted, and the conflict was in the one format git cannot merge. The lists move to testsuite/skiplist/*.txt, one name per line with the reason as a comment, and RSYNC_EXPECT_SKIPPED takes @FILE entries which runtests.py expands (relative to srcdir, so out-of-tree builds work). Several compose, which lets the 46 names common to Linux/macOS/Cygwin live in one file: adding a require_tcp test now edits one line of common.txt instead of three lists in three files. Lists must be sorted, duplicate-free, and name real tests, and an unreadable or malformed list is a hard error -- it must never degrade to "expect no skips", which would silently disarm the oracle on that job. fleettest passes the spec through to the remote runtests.py, which expands it against the tree that was staged there. The oracle itself is unchanged. Verified on Linux by running the full suite in all three lanes (check, check30, check29) against the new files: same expected sets, all green.