diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 46a2852ef72..8bbd8d4637f 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -110,15 +110,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 @@ -132,6 +123,7 @@ else "${SED}" -i 's|check-texinfo: $(syntax_checks)|check-texinfo:|' doc/local.mk ./bootstrap --skip-po ./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references \ + --enable-install-program="arch" \ "$([ "${SELINUX_ENABLED}" = 1 ] && echo --with-selinux || echo --without-selinux)" #Add timeout to to protect against hangs "${SED}" -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver @@ -235,9 +227,6 @@ test -f "${UU_BUILD_DIR}/getlimits" || cp src/getlimits "${UU_BUILD_DIR}" "${SED}" -i "s/ {ERR=>\"\$prog: foobar\\\\n\" \. \$try_help }/ {ERR=>\"error: unexpected argument '--foobar' found\n\n tip: to pass '--foobar' as a value, use '-- --foobar'\n\nUsage: basenc [OPTION]... [FILE]\n\nFor more information, try '--help'.\n\"}]/" tests/basenc/basenc.pl "${SED}" -i "s/ {ERR_SUBST=>\"s\/(unrecognized|unknown) option \[-' \]\*foobar\[' \]\*\/foobar\/\"}],//" tests/basenc/basenc.pl -# Remove the check whether a util was built. Otherwise tests against utils like "arch" are not run. -"${SED}" -i "s|require_built_ |# require_built_ |g" init.cfg - # exit early for the selinux check. The first is enough for us. "${SED}" -i "s|# Independent of whether SELinux|return 0\n #|g" init.cfg