GnuTests: Replace incompat tests (#9976)

Co-authored-by: oech3 <>
Co-authored-by: Sylvestre Ledru <sylvestre@debian.org>
This commit is contained in:
oech3
2026-01-18 22:41:34 +01:00
committed by GitHub
co-authored by oech3 <> Sylvestre Ledru
parent 4e7fa9fc94
commit b57838227e
2 changed files with 4 additions and 3 deletions
-3
View File
@@ -105,7 +105,6 @@ fi
cd "${path_GNU}" && echo "[ pwd:'${PWD}' ]"
# Any binaries that aren't built become `false` to make tests failure
# Note that some test (e.g. runcon/runcon-compute.sh) incorrectly passes by this
for binary in $(./build-aux/gen-lists-of-programs.sh --list-progs); do
bin_path="${UU_BUILD_DIR}/${binary}"
test -f "${bin_path}" || cp -v /usr/bin/false "${bin_path}"
@@ -170,8 +169,6 @@ sed -i 's/^print_ver_.*/require_selinux_/' tests/runcon/runcon-compute.sh
sed -i 's/^print_ver_.*/require_selinux_/' tests/runcon/runcon-no-reorder.sh
sed -i 's/^print_ver_.*/require_selinux_/' tests/chcon/chcon-fail.sh
# Mask mtab by unshare instead of LD_PRELOAD (able to merge this to GNU?)
sed -i -e 's|^export LD_PRELOAD=.*||' -e "s|.*maybe LD_PRELOAD.*|df() { unshare -rm bash -c \"mount -t tmpfs tmpfs /proc \&\& command df \\\\\"\\\\\$@\\\\\"\" -- \"\$@\"; }|" tests/df/no-mtab-status.sh
# We use coreutils yes
sed -i "s|--coreutils-prog=||g" tests/misc/coreutils.sh
# Different message
+4
View File
@@ -11,6 +11,10 @@ curl -L ${repo}/raw/refs/heads/master/tests/mkdir/writable-under-readonly.sh > t
curl -L ${repo}/raw/refs/heads/master/tests/cp/cp-mv-enotsup-xattr.sh > tests/cp/cp-mv-enotsup-xattr.sh #spell-checker:disable-line
curl -L ${repo}/raw/refs/heads/master/tests/cp/nfs-removal-race.sh > tests/cp/nfs-removal-race.sh
curl -L ${repo}/raw/refs/heads/master/tests/csplit/csplit-io-err.sh > tests/csplit/csplit-io-err.sh
# Replace tests not compatible with our binaries
sed -i -e 's/no-mtab-status.sh/no-mtab-status-masked-proc.sh/' -e 's/nproc-quota.sh/nproc-quota-systemd.sh/' tests/local.mk
curl -L ${repo}/raw/refs/heads/master/tests/df/no-mtab-status-masked-proc.sh > tests/df/no-mtab-status-masked-proc.sh
curl -L ${repo}/raw/refs/heads/master/tests/nproc/nproc-quota-systemd.sh > tests/nproc/nproc-quota-systemd.sh
curl -L ${repo}/raw/refs/heads/master/tests/stty/bad-speed.sh > tests/stty/bad-speed.sh
# Avoid incorrect PASS
curl -L ${repo}/raw/refs/heads/master/tests/runcon/runcon-compute.sh > tests/runcon/runcon-compute.sh