build-gnu.sh: Fail 2 help-version*.sh instead of removing

Author: oech3

util/build-gnu.sh

@@ -153,19 +153,21 @@ else
         echo "strip t${i}.sh from Makefile"
         "${SED}" -i -e "s/\$(tf)\/t${i}.sh//g" Makefile
     done
-
-    # Remove tests checking for --version & --help
-    # Not really interesting for us and logs are too big
-    "${SED}" -i -e '/tests\/help\/help-version.sh/ D' \
-        -e '/tests\/help\/help-version-getopt.sh/ D' \
-        Makefile
     touch gnu-built
 fi
 
 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"
 
+# Fail tests checking for --version & --help we can't pass producing too big logs
+cp -svf /usr/bin/false tests/help/help-version.sh
+cp -svf /usr/bin/false tests/help/help-version-getopt.sh
+echo Disable this test:
+echo "* the selinux crate is handling errors"
+echo '* the test says "maybe we should not fail when no context available"'
+cp -svf /usr/bin/true tests/cp/no-ctx.sh 
+
 # 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
@@ -351,8 +353,3 @@ test \$n_stat1 -ge \$n_stat2 \\' tests/ls/stat-free-color.sh
 # upstream doesn't having the program name in the error message
 # but we do. We should keep it that way.
 "${SED}" -i 's/echo "changing security context/echo "chcon: changing security context/' tests/chcon/chcon.sh
-
-# Disable this test, it is not relevant for us:
-# * the selinux crate is handling errors
-# * the test says "maybe we should not fail when no context available"
-"${SED}" -i -e "s|returns_ 1||g" tests/cp/no-ctx.sh