From: Wayne Davison <wayne@opencoder.net>
Date: Wed, 10 Jun 2020 20:14:27 +0000 (-0700)
Subject: Add support for /run/shm/tmp dir so the CI action doesn't skip a test.
X-Git-Tag: v3.2.0pre1~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=516ca6a442ab0a87f13b1f4cb2cd31f0d99969e1;p=thirdparty%2Frsync.git

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 0ffbde06..6108b889 100644
--- 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 bce544c3..1e05bcb5 100644
--- 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"