Skip to content

Commit 04e8a8e

Browse files
authored
Merge branch 'main' into upload-uudoc
2 parents 1fabbe9 + f6d581f commit 04e8a8e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/uu/env/src/env.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ struct Options<'a> {
102102
}
103103

104104
/// print `name=value` env pairs on screen
105-
/// if null is true, separate pairs with a \0, \n otherwise
106105
fn print_env(line_ending: LineEnding) {
107106
let stdout_raw = io::stdout();
108107
let mut stdout = stdout_raw.lock();

util/build-gnu.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW
66
# spell-checker:ignore baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo CARGOFLAGS
77
# spell-checker:ignore openat TOCTOU CFLAGS
8+
# spell-checker:ignore hfsplus casefold chattr
89

910
set -e
1011

@@ -167,6 +168,9 @@ grep -rl 'path_prepend_' tests/* | xargs -r "${SED}" -i 's| path_prepend_ ./src|
167168
# path_prepend_ sets $abs_path_dir_: set it manually instead.
168169
grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r "${SED}" -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g"
169170

171+
# Remove hfs dependency (should be merged to upstream)
172+
"${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
173+
170174
# Use the system coreutils where the test fails due to error in a util that is not the one being tested
171175
"${SED}" -i "s|grep '^#define HAVE_CAP 1' \$CONFIG_HEADER > /dev/null|true|" tests/ls/capability.sh
172176

util/why-skip.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
= LD_PRELOAD was ineffective? =
1414
* tests/cp/nfs-removal-race.sh
1515

16-
= failed to create hfs file system =
17-
* tests/mv/hardlink-case.sh
18-
1916
= temporarily disabled =
2017
* tests/mkdir/writable-under-readonly.sh
2118

0 commit comments

Comments
 (0)