From 8405bc260911418446466d83fe93c1bbe7c28c90 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 30 Apr 2026 08:18:01 +1000 Subject: [PATCH] testsuite/xattrs: ignore SUNWattr_* in the Solaris xls helper The Solaris xls() function listed every entry in the file's xattr directory, which on Solaris includes OS-managed SUNWattr_ro and SUNWattr_rw pseudo-attributes. SUNWattr_rw embeds the file creation time, so its bytes naturally differ between the source and destination files, making the xattrs and xattrs-hlink tests fail with diffs that have nothing to do with rsync. Rsync's own listxattr wrapper already filters these out (lib/sysxattrs.c), so the right fix is to filter them in the test display too. Other platforms are unaffected because each has its own xls() branch in the case statement. With the test now actually passing on Solaris, drop the CI hack that overwrote testsuite/xattrs.test with a skip stub. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/solaris-build.yml | 5 ----- testsuite/xattrs.test | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/solaris-build.yml b/.github/workflows/solaris-build.yml index a8d7869be..e41e002dc 100644 --- a/.github/workflows/solaris-build.yml +++ b/.github/workflows/solaris-build.yml @@ -34,11 +34,6 @@ jobs: ./configure --with-rrsync -disable-zstd --disable-md2man --disable-xxhash --disable-lz4 make ./rsync --version - cat > testsuite/xattrs.test <<'EOF' - #!/bin/sh - . $suitedir/rsync.fns - test_skipped "skipped on Solaris pending xattrs fix" - EOF make check ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true - name: save artifact diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test index d94d5f950..c0f3784b0 100644 --- a/testsuite/xattrs.test +++ b/testsuite/xattrs.test @@ -38,7 +38,10 @@ EOF xls() { for fn in "${@}"; do runat "$fn" "$SHELL_PATH" <