Skip to content

Commit 3e58f1b

Browse files
authored
build-gnu.sh: Fail 2 help-version*.sh instead of removing
1 parent 0f8eb45 commit 3e58f1b

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

util/build-gnu.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,17 @@ else
153153
echo "strip t${i}.sh from Makefile"
154154
"${SED}" -i -e "s/\$(tf)\/t${i}.sh//g" Makefile
155155
done
156-
157-
# Remove tests checking for --version & --help
158-
# Not really interesting for us and logs are too big
159-
"${SED}" -i -e '/tests\/help\/help-version.sh/ D' \
160-
-e '/tests\/help\/help-version-getopt.sh/ D' \
161-
Makefile
162156
touch gnu-built
163157
fi
164158

165159
grep -rl 'path_prepend_' tests/* | xargs -r "${SED}" -i 's| path_prepend_ ./src||'
166160
# path_prepend_ sets $abs_path_dir_: set it manually instead.
167161
grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r "${SED}" -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g"
168162

163+
# Fail tests checking for --version & --help we can't pass producing too big logs
164+
cp -svf $(command -v false) tests/help/help-version.sh
165+
cp -svf $(command -v false) tests/help/help-version-getopt.sh
166+
169167
# We can't build runcon and chcon without libselinux. But GNU no longer builds dummies of them. So consider they are SELinux specific.
170168
"${SED}" -i 's/^print_ver_.*/require_selinux_/' tests/runcon/runcon-compute.sh
171169
"${SED}" -i 's/^print_ver_.*/require_selinux_/' tests/runcon/runcon-no-reorder.sh

0 commit comments

Comments
 (0)