Skip to content

Commit be38d39

Browse files
oech3oech3
authored andcommitted
build-gnu.sh: Fail 2 help-version*.sh and keep them into the log
1 parent c8c412c commit be38d39

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
@@ -156,19 +156,18 @@ else
156156
echo "strip t${i}.sh from Makefile"
157157
"${SED}" -i -e "s/\$(tf)\/t${i}.sh//g" Makefile
158158
done
159-
160-
# Remove tests checking for --version & --help
161-
# Not really interesting for us and logs are too big
162-
"${SED}" -i -e '/tests\/help\/help-version.sh/ D' \
163-
-e '/tests\/help\/help-version-getopt.sh/ D' \
164-
Makefile
165159
touch gnu-built
166160
fi
167161

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

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

0 commit comments

Comments
 (0)