Skip to content

Commit 39a8c87

Browse files
oech3cakebaker
andauthored
build-gnu.sh: Enable misc/coreutils.sh (#9572)
* build-gnu.sh: Enable misc/coreutils.sh * why-error.md: Remove misc/coreutils.sh Co-authored-by: Daniel Hofstetter <[email protected]> --------- Co-authored-by: Daniel Hofstetter <[email protected]>
1 parent 45c974f commit 39a8c87

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

util/build-gnu.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ else
135135
./bootstrap --skip-po
136136
# Use CFLAGS for best build time since we discard GNU coreutils
137137
CFLAGS="${CFLAGS} -pipe -O0 -s" ./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references \
138+
--enable-single-binary=symlinks \
138139
"$([ "${SELINUX_ENABLED}" = 1 ] && echo --with-selinux || echo --without-selinux)"
139140
#Add timeout to to protect against hangs
140141
"${SED}" -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver
@@ -169,6 +170,11 @@ grep -rl 'path_prepend_' tests/* | xargs -r "${SED}" -i 's| path_prepend_ ./src|
169170
# path_prepend_ sets $abs_path_dir_: set it manually instead.
170171
grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r "${SED}" -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g"
171172

173+
# We use coreutils yes
174+
"${SED}" -i "s|--coreutils-prog=||g" tests/misc/coreutils.sh
175+
# Different message
176+
"${SED}" -i "s|coreutils: unknown program 'blah'|blah: function/utility not found|" tests/misc/coreutils.sh
177+
172178
# Remove hfs dependency (should be merged to upstream)
173179
"${SED}" -i -e "s|hfsplus|ext4 -O casefold|" -e "s|cd mnt|rm -d mnt/lost+found;chattr +F mnt;cd mnt|" tests/mv/hardlink-case.sh
174180

util/why-skip.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
= The Swedish locale with blank thousands separator is unavailable. =
4545
* tests/misc/sort-h-thousands-sep.sh
4646

47-
= multicall binary is disabled =
48-
* tests/misc/coreutils.sh
49-
5047
= not running on GNU/Hurd =
5148
* tests/id/gnu-zero-uids.sh
5249

0 commit comments

Comments
 (0)