diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 626400d6a57..07ba6954e87 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -111,15 +111,6 @@ test -f "${UU_BUILD_DIR}/[" || (cd ${UU_BUILD_DIR} && ln -s "test" "[") cd "${path_GNU}" && echo "[ pwd:'${PWD}' ]" -# Any binaries that aren't built become `false` so their tests fail -for binary in $(./build-aux/gen-lists-of-programs.sh --list-progs); do - bin_path="${UU_BUILD_DIR}/${binary}" - test -f "${bin_path}" || { - echo "'${binary}' was not built with uutils, using the 'false' program" - cp "${UU_BUILD_DIR}/false" "${bin_path}" - } -done - # Always update the PATH to test the uutils coreutils instead of the GNU coreutils # This ensures the correct path is used even if the repository was moved or rebuilt in a different location "${SED}" -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" tests/local.mk @@ -170,6 +161,11 @@ grep -rl 'path_prepend_' tests/* | xargs -r "${SED}" -i 's| path_prepend_ ./src| # path_prepend_ sets $abs_path_dir_: set it manually instead. grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r "${SED}" -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g" +# We can't build runcon and chcon without libselinux. But GNU no longer builds dummies of them. So consider they are SELinux specific. +"${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 + # We use coreutils yes "${SED}" -i "s|--coreutils-prog=||g" tests/misc/coreutils.sh # Different message