Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions util/build-gnu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW
# spell-checker:ignore baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo CARGOFLAGS
# spell-checker:ignore openat TOCTOU CFLAGS
# spell-checker:ignore hfsplus casefold chattr

set -e

Expand Down Expand Up @@ -34,7 +33,9 @@ path_GNU="$("${READLINK}" -fm -- "${path_GNU:-${path_UUTILS}/../gnu}")"

###

release_tag_GNU="v9.9"
#temporarily bump commit to enable some tests e.g. writable-under-readonly.sh
release_tag_GNU="d5a75a2f93aef30fe6b99eead74f8c0f11203e43"
#release_tag_GNU="v9.9"

# check if the GNU coreutils has been cloned, if not print instructions
# note: the ${path_GNU} might already exist, so we check for the .git directory
Expand Down Expand Up @@ -135,6 +136,7 @@ else
./bootstrap --skip-po
# Use CFLAGS for best build time since we discard GNU coreutils
CFLAGS="${CFLAGS} -pipe -O0 -s" ./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references \
--enable-install-program="kill,uptime,hostname" \
"$([ "${SELINUX_ENABLED}" = 1 ] && echo --with-selinux || echo --without-selinux)"
#Add timeout to to protect against hangs
"${SED}" -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver
Expand Down Expand Up @@ -169,9 +171,6 @@ 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"

# Remove hfs dependency (should be merged to upstream)
"${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

# Use the system coreutils where the test fails due to error in a util that is not the one being tested
"${SED}" -i "s|grep '^#define HAVE_CAP 1' \$CONFIG_HEADER > /dev/null|true|" tests/ls/capability.sh

Expand Down
6 changes: 0 additions & 6 deletions util/why-skip.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
= LD_PRELOAD was ineffective? =
* tests/cp/nfs-removal-race.sh

= temporarily disabled =
* tests/mkdir/writable-under-readonly.sh

= this system lacks SMACK support =
* tests/mkdir/smack-root.sh
* tests/mkdir/smack-no-root.sh
Expand Down Expand Up @@ -53,9 +50,6 @@
= no rootfs in mtab =
* tests/df/skip-rootfs.sh

= insufficient mount/ext2 support =
* tests/cp/cp-mv-enotsup-xattr.sh

= requires controlling input terminal =
* tests/misc/stty-pairs.sh
* tests/misc/stty.sh
Expand Down
Loading