Add support for /run/shm/tmp dir so the CI action doesn't skip a test.

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 0ffbde063872a0da5d3a801216b081046ebbfa53..6108b889b9020f45a97c84ac29aca22b60370a8d 100644 (file)
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -15,6 +15,8 @@ jobs:
     - uses: actions/checkout@v2
     - name: prepare-packages
       run: sudo apt-get install fakeroot acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm
+    - name: add other-filesystem tmp dir
+      run: mkdir -m 1777 /run/shm/tmp
     - name: prepare-source
       run: ./prepare-source
     - name: configure

diff --git a/testsuite/chmod-temp-dir.test b/testsuite/chmod-temp-dir.test
index bce544c384f34d29a65678823bfc5016617742f6..1e05bcb50112b4325417cdd1e113171e3f436882 100644 (file)
--- a/testsuite/chmod-temp-dir.test
+++ b/testsuite/chmod-temp-dir.test
@@ -13,21 +13,16 @@
 
 hands_setup
 
-tmpdir2=$RSYNC_TEST_TMP
-if [ x"$tmpdir2" = x ]; then
-    tmpdir2=/tmp
-fi
 sdev=`$TOOLDIR/getfsdev $scratchdir`
-tdev=`$TOOLDIR/getfsdev $tmpdir2`
-if [ x$sdev = x$tdev ]; then
-    tmpdir2=/var/tmp
-    if [ -d $tmpdir2 ]; then
-       tdev=`$TOOLDIR/getfsdev $tmpdir2`
-    else
-       tdev="$sdev"
-    fi
-    [ x$sdev = x$tdev ] && test_skipped "Can't find a tmp dir on a different file system"
-fi
+tdev=$sdev
+
+for tmpdir2 in "${RSYNC_TEST_TMP:-/override-tmp-not-specified}" /run/shm/tmp /var/tmp /tmp; do
+    [ -d "$tmpdir2" ] || continue
+    tdev=`$TOOLDIR/getfsdev "$tmpdir2"`
+    [ x$sdev != x$tdev ] && break
+done
+
+[ x$sdev = x$tdev ] && test_skipped "Can't find a tmp dir on a different file system"
 
 chmod 440 "$fromdir/text"
 chmod 500 "$fromdir/dir/text"