From be38d3988603372f5addf9161aa03fea492c43ab Mon Sep 17 00:00:00 2001 From: oech3 <79379754+oech3@users.noreply.github.com> Date: Tue, 23 Dec 2025 23:25:58 +0900 Subject: [PATCH] build-gnu.sh: Fail 2 help-version*.sh and keep them into the log --- util/build-gnu.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 734cde88cbd..3000cbbed42 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -156,12 +156,6 @@ 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 @@ -169,6 +163,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" +# Fail tests checking for --version & --help we can't pass producing too big logs +# But we keep them into the log and should not remove +cp -svf /usr/bin/false tests/help/help-version.sh +cp -svf /usr/bin/false tests/help/help-version-getopt.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