Skip to content

Commit ff87f56

Browse files
committed
build-gnu.sh: Fail 2 help-version*.sh and keep them into the log
1 parent 40e50ba commit ff87f56

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

util/build-gnu.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,19 +155,18 @@ else
155155
echo "strip t${i}.sh from Makefile"
156156
"${SED}" -i -e "s/\$(tf)\/t${i}.sh//g" Makefile
157157
done
158-
159-
# Remove tests checking for --version & --help
160-
# Not really interesting for us and logs are too big
161-
"${SED}" -i -e '/tests\/help\/help-version.sh/ D' \
162-
-e '/tests\/help\/help-version-getopt.sh/ D' \
163-
Makefile
164158
touch gnu-built
165159
fi
166160

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

165+
# Fail tests checking for --version & --help we can't pass producing too big logs
166+
# But we keep them into the log and should not remove
167+
cp -svf /usr/bin/false tests/help/help-version.sh
168+
cp -svf /usr/bin/false tests/help/help-version-getopt.sh
169+
171170
# We can't build runcon and chcon without libselinux. But GNU no longer builds dummies of them. So consider they are SELinux specific.
172171
"${SED}" -i 's/^print_ver_.*/require_selinux_/' tests/runcon/runcon-compute.sh
173172
"${SED}" -i 's/^print_ver_.*/require_selinux_/' tests/runcon/runcon-no-reorder.sh

0 commit comments

Comments
 (0)