From: Bernd Schubert <bschubert@ddn.com>
Date: Tue, 5 Mar 2024 23:37:53 +0000 (+0100)
Subject: ci-build.sh: Always install and add s-bit for fusermount3
X-Git-Tag: fuse-3.17.1-rc0~145^2
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aab146eea8877ee744a1b5a0da8bbbf31d14bad1;p=qemu-gpiodev%2Flibfuse.git

ci-build.sh: Always install and add s-bit for fusermount3

As per pull #898, fusermount3 had a severe issue that
should have been detected by ASAN. I guess tests used
the system default and not the sanitized binary.
Order of execution of fusermount3 is to try
1) full install path
if that fails
2) just fusermount3

So tests should be fixed by installing libfuse, setting the s-bit
on fusermount3 and then to run the tests.
---

diff --git a/test/ci-build.sh b/test/ci-build.sh
index c266ea2..a023c15 100755
--- a/test/ci-build.sh
+++ b/test/ci-build.sh
@@ -18,6 +18,9 @@ umask 0022
 # readable/executable.
 SOURCE_DIR="$(readlink -f .)"
 TEST_DIR="$(mktemp -dt libfuse-build-XXXXXX)"
+
+PREFIX_DIR="$(mktemp -dt libfuse-install-XXXXXXX)"
+
 chmod 0755 "${TEST_DIR}"
 cd "${TEST_DIR}"
 echo "Running in ${TEST_DIR}"
@@ -47,13 +50,17 @@ for CC in gcc gcc-9 gcc-10 clang; do
     else
         build_opts=''
     fi
-    meson setup -D werror=true ${build_opts} "${SOURCE_DIR}" || (cat meson-logs/meson-log.txt; false)
+    meson setup -Dprefix=${PREFIX_DIR} -D werror=true ${build_opts} "${SOURCE_DIR}" || (cat meson-logs/meson-log.txt; false)
     ninja
+    sudo ninja install
+
+    # libfuse will first try the install path and then system defaults
+    sudo chmod 4755 ${PREFIX_DIR}/bin/fusermount3
 
-    sudo chown root:root util/fusermount3
-    sudo chmod 4755 util/fusermount3
     ${TEST_CMD}
     popd
+    rm -fr build-${CC}
+    sudo rm -fr ${PREFIX_DIR}
 done
 
 sanitized_build()
@@ -62,7 +69,7 @@ sanitized_build()
 
     mkdir build-san; pushd build-san
 
-    meson setup -D werror=true\
+    meson setup -Dprefix=${PREFIX_DIR} -D werror=true\
            "${SOURCE_DIR}" \
            || (ct meson-logs/meson-log.txt; false)
     meson configure $SAN
@@ -73,11 +80,11 @@ sanitized_build()
 
     meson configure
     ninja
+    sudo ninja install
+    sudo chmod 4755 ${PREFIX_DIR}/bin/fusermount3
 
     # Test as root and regular user
     sudo ${TEST_CMD}
-    sudo chown root:root util/fusermount3
-    sudo chmod 4755 util/fusermount3
     # Cleanup temporary files (since they are now owned by root)
     sudo rm -rf test/.pytest_cache/ test/__pycache__
 
@@ -85,6 +92,7 @@ sanitized_build()
     
     popd
     rm -fr build-san
+    sudo rm -fr ${PREFIX_DIR}
 )
 
 # Sanitized build