mirror of
https://github.com/uutils/coreutils.git
synced 2025-12-23 08:47:37 +00:00
build-gnu.sh: use GNU sed much more for macOS
This commit is contained in:
oech3
GitHub
parent
b4423b9691
commit
1539cd2fe7
1 changed files with 60 additions and 63 deletions
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
set -e
|
||||
|
||||
# Use system's GNU version for make, nproc, readlink and sed on *BSD
|
||||
# Use system's GNU version for make, nproc, readlink and sed on *BSD and macOS
|
||||
MAKE=$(command -v gmake||command -v make)
|
||||
NPROC=$(command -v gnproc||command -v nproc)
|
||||
READLINK=$(command -v greadlink||command -v readlink)
|
||||
|
|
@ -121,7 +121,7 @@ done
|
|||
|
||||
# Always update the PATH to test the uutils coreutils instead of the GNU coreutils
|
||||
# This ensures the correct path is used even if the repository was moved or rebuilt in a different location
|
||||
sed -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" tests/local.mk
|
||||
"${SED}" -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)'\"\$\$PATH\" \\\/" tests/local.mk
|
||||
|
||||
if test -f gnu-built; then
|
||||
echo "GNU build already found. Skip"
|
||||
|
|
@ -129,15 +129,15 @@ if test -f gnu-built; then
|
|||
echo "Note: the customization of the tests will still happen"
|
||||
else
|
||||
# Disable useless checks
|
||||
sed -i 's|check-texinfo: $(syntax_checks)|check-texinfo:|' doc/local.mk
|
||||
"${SED}" -i 's|check-texinfo: $(syntax_checks)|check-texinfo:|' doc/local.mk
|
||||
./bootstrap --skip-po
|
||||
./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references \
|
||||
"$([ "${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
|
||||
sed -i 's| tr | /usr/bin/tr |' tests/init.sh
|
||||
"${SED}" -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver
|
||||
"${SED}" -i 's| tr | /usr/bin/tr |' tests/init.sh
|
||||
# Use a better diff
|
||||
sed -i 's|diff -c|diff -u|g' tests/Coreutils.pm
|
||||
"${SED}" -i 's|diff -c|diff -u|g' tests/Coreutils.pm
|
||||
"${MAKE}" -j "$("${NPROC}")"
|
||||
|
||||
# Handle generated factor tests
|
||||
|
|
@ -152,152 +152,150 @@ else
|
|||
)
|
||||
for i in ${seq}; do
|
||||
echo "strip t${i}.sh from Makefile"
|
||||
sed -i -e "s/\$(tf)\/t${i}.sh//g" Makefile
|
||||
"${SED}" -i -e "s/\$(tf)\/t${i}.sh//g" Makefile
|
||||
done
|
||||
|
||||
# Remove tests checking for --version & --help
|
||||
# Not really interesting for us and logs are too big
|
||||
sed -i -e '/tests\/help\/help-version.sh/ D' \
|
||||
"${SED}" -i -e '/tests\/help\/help-version.sh/ D' \
|
||||
-e '/tests\/help\/help-version-getopt.sh/ D' \
|
||||
Makefile
|
||||
touch gnu-built
|
||||
fi
|
||||
|
||||
grep -rl 'path_prepend_' tests/* | xargs -r sed -i 's| path_prepend_ ./src||'
|
||||
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"
|
||||
grep -rl '\$abs_path_dir_' tests/*/*.sh | xargs -r "${SED}" -i "s|\$abs_path_dir_|${UU_BUILD_DIR//\//\\/}|g"
|
||||
|
||||
# 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
|
||||
"${SED}" -i "s|grep '^#define HAVE_CAP 1' \$CONFIG_HEADER > /dev/null|true|" tests/ls/capability.sh
|
||||
|
||||
# our messages are better
|
||||
sed -i "s|cannot stat 'symlink': Permission denied|not writing through dangling symlink 'symlink'|" tests/cp/fail-perm.sh
|
||||
sed -i "s|cp: target directory 'symlink': Permission denied|cp: 'symlink' is not a directory|" tests/cp/fail-perm.sh
|
||||
"${SED}" -i "s|cannot stat 'symlink': Permission denied|not writing through dangling symlink 'symlink'|" tests/cp/fail-perm.sh
|
||||
"${SED}" -i "s|cp: target directory 'symlink': Permission denied|cp: 'symlink' is not a directory|" tests/cp/fail-perm.sh
|
||||
|
||||
# Our message is a bit better
|
||||
sed -i "s|cannot create regular file 'no-such/': Not a directory|'no-such/' is not a directory|" tests/mv/trailing-slash.sh
|
||||
"${SED}" -i "s|cannot create regular file 'no-such/': Not a directory|'no-such/' is not a directory|" tests/mv/trailing-slash.sh
|
||||
|
||||
# Our message is better
|
||||
sed -i "s|warning: unrecognized escape|warning: incomplete hex escape|" tests/stat/stat-printf.pl
|
||||
"${SED}" -i "s|warning: unrecognized escape|warning: incomplete hex escape|" tests/stat/stat-printf.pl
|
||||
|
||||
sed -i 's|timeout |'"${SYSTEM_TIMEOUT}"' |' tests/tail/follow-stdin.sh
|
||||
"${SED}" -i 's|timeout |'"${SYSTEM_TIMEOUT}"' |' tests/tail/follow-stdin.sh
|
||||
|
||||
# trap_sigpipe_or_skip_ fails with uutils tools because of a bug in
|
||||
# timeout/yes (https://github.com/uutils/coreutils/issues/7252), so we use
|
||||
# system's yes/timeout to make sure the tests run (instead of being skipped).
|
||||
sed -i 's|\(trap .* \)timeout\( .* \)yes|'"\1${SYSTEM_TIMEOUT}\2${SYSTEM_YES}"'|' init.cfg
|
||||
"${SED}" -i 's|\(trap .* \)timeout\( .* \)yes|'"\1${SYSTEM_TIMEOUT}\2${SYSTEM_YES}"'|' init.cfg
|
||||
|
||||
# Remove dup of /usr/bin/ and /usr/local/bin/ when executed several times
|
||||
grep -rlE '/usr/bin/\s?/usr/bin' init.cfg tests/* | xargs -r sed -Ei 's|/usr/bin/\s?/usr/bin/|/usr/bin/|g'
|
||||
grep -rlE '/usr/local/bin/\s?/usr/local/bin' init.cfg tests/* | xargs -r sed -Ei 's|/usr/local/bin/\s?/usr/local/bin/|/usr/local/bin/|g'
|
||||
grep -rlE '/usr/bin/\s?/usr/bin' init.cfg tests/* | xargs -r "${SED}" -Ei 's|/usr/bin/\s?/usr/bin/|/usr/bin/|g'
|
||||
grep -rlE '/usr/local/bin/\s?/usr/local/bin' init.cfg tests/* | xargs -r "${SED}" -Ei 's|/usr/local/bin/\s?/usr/local/bin/|/usr/local/bin/|g'
|
||||
|
||||
#### Adjust tests to make them work with Rust/coreutils
|
||||
# in some cases, what we are doing in rust/coreutils is good (or better)
|
||||
# we should not regress our project just to match what GNU is going.
|
||||
# So, do some changes on the fly
|
||||
|
||||
sed -i -e "s|removed directory 'a/'|removed directory 'a'|g" tests/rm/v-slash.sh
|
||||
"${SED}" -i -e "s|removed directory 'a/'|removed directory 'a'|g" tests/rm/v-slash.sh
|
||||
|
||||
# 'rel' doesn't exist. Our implementation is giving a better message.
|
||||
sed -i -e "s|rm: cannot remove 'rel': Permission denied|rm: cannot remove 'rel': No such file or directory|g" tests/rm/inaccessible.sh
|
||||
"${SED}" -i -e "s|rm: cannot remove 'rel': Permission denied|rm: cannot remove 'rel': No such file or directory|g" tests/rm/inaccessible.sh
|
||||
|
||||
# Our implementation shows "Directory not empty" for directories that can't be accessed due to lack of execute permissions
|
||||
# This is actually more accurate than "Permission denied" since the real issue is that we can't empty the directory
|
||||
sed -i -e "s|rm: cannot remove 'a/1': Permission denied|rm: cannot remove 'a/1/2': Permission denied|g" -e "s|rm: cannot remove 'b': Permission denied|rm: cannot remove 'a': Directory not empty\nrm: cannot remove 'b/3': Permission denied|g" tests/rm/rm2.sh
|
||||
"${SED}" -i -e "s|rm: cannot remove 'a/1': Permission denied|rm: cannot remove 'a/1/2': Permission denied|g" -e "s|rm: cannot remove 'b': Permission denied|rm: cannot remove 'a': Directory not empty\nrm: cannot remove 'b/3': Permission denied|g" tests/rm/rm2.sh
|
||||
|
||||
# overlay-headers.sh test intends to check for inotify events,
|
||||
# however there's a bug because `---dis` is an alias for: `---disable-inotify`
|
||||
sed -i -e "s|---dis ||g" tests/tail/overlay-headers.sh
|
||||
|
||||
# Do not FAIL, just do a regular ERROR
|
||||
sed -i -e "s|framework_failure_ 'no inotify_add_watch';|fail=1;|" tests/tail/inotify-rotate-resources.sh
|
||||
"${SED}" -i -e "s|framework_failure_ 'no inotify_add_watch';|fail=1;|" tests/tail/inotify-rotate-resources.sh
|
||||
|
||||
test -f "${UU_BUILD_DIR}/getlimits" || cp src/getlimits "${UU_BUILD_DIR}"
|
||||
|
||||
# pr produces very long log and this command isn't super interesting
|
||||
# SKIP for now
|
||||
sed -i -e "s|my \$prog = 'pr';$|my \$prog = 'pr';CuSkip::skip \"\$prog: SKIP for producing too long logs\";|" tests/pr/pr-tests.pl
|
||||
"${SED}" -i -e "s|my \$prog = 'pr';$|my \$prog = 'pr';CuSkip::skip \"\$prog: SKIP for producing too long logs\";|" tests/pr/pr-tests.pl
|
||||
|
||||
# We don't have the same error message and no need to be that specific
|
||||
sed -i -e "s|invalid suffix in --pages argument|invalid --pages argument|" \
|
||||
"${SED}" -i -e "s|invalid suffix in --pages argument|invalid --pages argument|" \
|
||||
-e "s|--pages argument '\$too_big' too large|invalid --pages argument '\$too_big'|" \
|
||||
-e "s|invalid page range|invalid --pages argument|" tests/misc/xstrtol.pl
|
||||
|
||||
# When decoding an invalid base32/64 string, gnu writes everything it was able to decode until
|
||||
# it hit the decode error, while we don't write anything if the input is invalid.
|
||||
sed -i "s/\(baddecode.*OUT=>\"\).*\"/\1\"/g" tests/basenc/base64.pl
|
||||
sed -i "s/\(\(b2[ml]_[69]\|z85_8\|z85_35\).*OUT=>\)[^}]*\(.*\)/\1\"\"\3/g" tests/basenc/basenc.pl
|
||||
"${SED}" -i "s/\(baddecode.*OUT=>\"\).*\"/\1\"/g" tests/basenc/base64.pl
|
||||
"${SED}" -i "s/\(\(b2[ml]_[69]\|z85_8\|z85_35\).*OUT=>\)[^}]*\(.*\)/\1\"\"\3/g" tests/basenc/basenc.pl
|
||||
|
||||
# add "error: " to the expected error message
|
||||
sed -i "s/\$prog: invalid input/\$prog: error: invalid input/g" tests/basenc/basenc.pl
|
||||
"${SED}" -i "s/\$prog: invalid input/\$prog: error: invalid input/g" tests/basenc/basenc.pl
|
||||
|
||||
# basenc: swap out error message for unexpected arg
|
||||
sed -i "s/ {ERR=>\"\$prog: foobar\\\\n\" \. \$try_help }/ {ERR=>\"error: unexpected argument '--foobar' found\n\n tip: to pass '--foobar' as a value, use '-- --foobar'\n\nUsage: basenc [OPTION]... [FILE]\n\nFor more information, try '--help'.\n\"}]/" tests/basenc/basenc.pl
|
||||
sed -i "s/ {ERR_SUBST=>\"s\/(unrecognized|unknown) option \[-' \]\*foobar\[' \]\*\/foobar\/\"}],//" tests/basenc/basenc.pl
|
||||
"${SED}" -i "s/ {ERR=>\"\$prog: foobar\\\\n\" \. \$try_help }/ {ERR=>\"error: unexpected argument '--foobar' found\n\n tip: to pass '--foobar' as a value, use '-- --foobar'\n\nUsage: basenc [OPTION]... [FILE]\n\nFor more information, try '--help'.\n\"}]/" tests/basenc/basenc.pl
|
||||
"${SED}" -i "s/ {ERR_SUBST=>\"s\/(unrecognized|unknown) option \[-' \]\*foobar\[' \]\*\/foobar\/\"}],//" tests/basenc/basenc.pl
|
||||
|
||||
# Remove the check whether a util was built. Otherwise tests against utils like "arch" are not run.
|
||||
sed -i "s|require_built_ |# require_built_ |g" init.cfg
|
||||
"${SED}" -i "s|require_built_ |# require_built_ |g" init.cfg
|
||||
|
||||
# exit early for the selinux check. The first is enough for us.
|
||||
sed -i "s|# Independent of whether SELinux|return 0\n #|g" init.cfg
|
||||
"${SED}" -i "s|# Independent of whether SELinux|return 0\n #|g" init.cfg
|
||||
|
||||
# Some tests are executed with the "nobody" user.
|
||||
# The check to verify if it works is based on the GNU coreutils version
|
||||
# making it too restrictive for us
|
||||
sed -i "s|\$PACKAGE_VERSION|[0-9]*|g" tests/rm/fail-2eperm.sh tests/mv/sticky-to-xpart.sh init.cfg
|
||||
"${SED}" -i "s|\$PACKAGE_VERSION|[0-9]*|g" tests/rm/fail-2eperm.sh tests/mv/sticky-to-xpart.sh init.cfg
|
||||
|
||||
# usage_vs_getopt.sh is heavily modified as it runs all the binaries
|
||||
# with the option -/ is used, clap is returning a better error than GNU's. Adjust the GNU test
|
||||
sed -i -e "s~ grep \" '\*/'\*\" err || framework_failure_~ grep \" '*-/'*\" err || framework_failure_~" tests/misc/usage_vs_getopt.sh
|
||||
sed -i -e "s~ sed -n \"1s/'\\\/'/'OPT'/p\" < err >> pat || framework_failure_~ sed -n \"1s/'-\\\/'/'OPT'/p\" < err >> pat || framework_failure_~" tests/misc/usage_vs_getopt.sh
|
||||
"${SED}" -i -e "s~ grep \" '\*/'\*\" err || framework_failure_~ grep \" '*-/'*\" err || framework_failure_~" tests/misc/usage_vs_getopt.sh
|
||||
"${SED}" -i -e "s~ sed -n \"1s/'\\\/'/'OPT'/p\" < err >> pat || framework_failure_~ sed -n \"1s/'-\\\/'/'OPT'/p\" < err >> pat || framework_failure_~" tests/misc/usage_vs_getopt.sh
|
||||
# Ignore runcon, it needs some extra attention
|
||||
# For all other tools, we want drop-in compatibility, and that includes the exit code.
|
||||
sed -i -e "s/rcexp=1$/rcexp=1\n case \"\$prg\" in runcon|stdbuf) return;; esac/" tests/misc/usage_vs_getopt.sh
|
||||
"${SED}" -i -e "s/rcexp=1$/rcexp=1\n case \"\$prg\" in runcon|stdbuf) return;; esac/" tests/misc/usage_vs_getopt.sh
|
||||
# GNU has option=[SUFFIX], clap is <SUFFIX>
|
||||
sed -i -e "s/cat opts/sed -i -e \"s| <.\*$||g\" opts/" tests/misc/usage_vs_getopt.sh
|
||||
"${SED}" -i -e "s/cat opts/sed -i -e \"s| <.\*$||g\" opts/" tests/misc/usage_vs_getopt.sh
|
||||
# for some reasons, some stuff are duplicated, strip that
|
||||
sed -i -e "s/provoked error./provoked error\ncat pat |sort -u > pat/" tests/misc/usage_vs_getopt.sh
|
||||
"${SED}" -i -e "s/provoked error./provoked error\ncat pat |sort -u > pat/" tests/misc/usage_vs_getopt.sh
|
||||
|
||||
# install verbose messages shows ginstall as command
|
||||
sed -i -e "s/ginstall: creating directory/install: creating directory/g" tests/install/basic-1.sh
|
||||
"${SED}" -i -e "s/ginstall: creating directory/install: creating directory/g" tests/install/basic-1.sh
|
||||
|
||||
# GNU doesn't support padding < -LONG_MAX
|
||||
# disable this test case
|
||||
# Use GNU sed because option -z is not available on BSD sed
|
||||
"${SED}" -i -Ez "s/\n([^\n#]*pad-3\.2[^\n]*)\n([^\n]*)\n([^\n]*)/\n# uutils\/numfmt supports padding = LONG_MIN\n#\1\n#\2\n#\3/" tests/numfmt/numfmt.pl
|
||||
|
||||
# Update the GNU error message to match the one generated by clap
|
||||
sed -i -e "s/\$prog: multiple field specifications/error: the argument '--field <FIELDS>' cannot be used multiple times\n\nUsage: numfmt [OPTION]... [NUMBER]...\n\nFor more information, try '--help'./g" tests/numfmt/numfmt.pl
|
||||
sed -i -e "s/Try 'mv --help' for more information/For more information, try '--help'/g" -e "s/mv: missing file operand/error: the following required arguments were not provided:\n <files>...\n\nUsage: mv [OPTION]... [-T] SOURCE DEST\n mv [OPTION]... SOURCE... DIRECTORY\n mv [OPTION]... -t DIRECTORY SOURCE...\n/g" -e "s/mv: missing destination file operand after 'no-file'/error: The argument '<files>...' requires at least 2 values, but only 1 was provided\n\nUsage: mv [OPTION]... [-T] SOURCE DEST\n mv [OPTION]... SOURCE... DIRECTORY\n mv [OPTION]... -t DIRECTORY SOURCE...\n/g" tests/mv/diag.sh
|
||||
"${SED}" -i -e "s/\$prog: multiple field specifications/error: the argument '--field <FIELDS>' cannot be used multiple times\n\nUsage: numfmt [OPTION]... [NUMBER]...\n\nFor more information, try '--help'./g" tests/numfmt/numfmt.pl
|
||||
"${SED}" -i -e "s/Try 'mv --help' for more information/For more information, try '--help'/g" -e "s/mv: missing file operand/error: the following required arguments were not provided:\n <files>...\n\nUsage: mv [OPTION]... [-T] SOURCE DEST\n mv [OPTION]... SOURCE... DIRECTORY\n mv [OPTION]... -t DIRECTORY SOURCE...\n/g" -e "s/mv: missing destination file operand after 'no-file'/error: The argument '<files>...' requires at least 2 values, but only 1 was provided\n\nUsage: mv [OPTION]... [-T] SOURCE DEST\n mv [OPTION]... SOURCE... DIRECTORY\n mv [OPTION]... -t DIRECTORY SOURCE...\n/g" tests/mv/diag.sh
|
||||
|
||||
# our error message is better
|
||||
sed -i -e "s|mv: cannot overwrite 'a/t': Directory not empty|mv: cannot move 'b/t' to 'a/t': Directory not empty|" tests/mv/dir2dir.sh
|
||||
"${SED}" -i -e "s|mv: cannot overwrite 'a/t': Directory not empty|mv: cannot move 'b/t' to 'a/t': Directory not empty|" tests/mv/dir2dir.sh
|
||||
|
||||
# GNU doesn't support width > INT_MAX
|
||||
# disable these test cases
|
||||
sed -i -E "s|^([^#]*2_31.*)$|#\1|g" tests/printf/printf-cov.pl
|
||||
"${SED}" -i -E "s|^([^#]*2_31.*)$|#\1|g" tests/printf/printf-cov.pl
|
||||
|
||||
sed -i -e "s/du: invalid -t argument/du: invalid --threshold argument/" -e "s/du: option requires an argument/error: a value is required for '--threshold <SIZE>' but none was supplied/" -e "s/Try 'du --help' for more information./\nFor more information, try '--help'./" tests/du/threshold.sh
|
||||
"${SED}" -i -e "s/du: invalid -t argument/du: invalid --threshold argument/" -e "s/du: option requires an argument/error: a value is required for '--threshold <SIZE>' but none was supplied/" -e "s/Try 'du --help' for more information./\nFor more information, try '--help'./" tests/du/threshold.sh
|
||||
|
||||
# Remove the extra output check
|
||||
sed -i -e "s|Try '\$prog --help' for more information.\\\n||" tests/du/files0-from.pl
|
||||
sed -i -e "s|when reading file names from stdin, no file name of\"|-: No such file or directory\n\"|" -e "s| '-' allowed\\\n||" tests/du/files0-from.pl
|
||||
sed -i -e "s|-: No such file or directory|cannot access '-': No such file or directory|g" tests/du/files0-from.pl
|
||||
"${SED}" -i -e "s|Try '\$prog --help' for more information.\\\n||" tests/du/files0-from.pl
|
||||
"${SED}" -i -e "s|when reading file names from stdin, no file name of\"|-: No such file or directory\n\"|" -e "s| '-' allowed\\\n||" tests/du/files0-from.pl
|
||||
"${SED}" -i -e "s|-: No such file or directory|cannot access '-': No such file or directory|g" tests/du/files0-from.pl
|
||||
|
||||
# Skip the move-dir-while-traversing test - our implementation uses safe traversal with openat()
|
||||
# which avoids the TOCTOU race condition that this test tries to trigger. The test uses inotify
|
||||
# to detect when du opens a directory path and moves it to cause an error, but our openat-based
|
||||
# implementation doesn't trigger inotify events on the full path, preventing the race condition.
|
||||
# This is actually better behavior - we're immune to this class of filesystem race attacks.
|
||||
sed -i '1s/^/exit 0 # Skip test - uutils du uses safe traversal that prevents this race condition\n/' tests/du/move-dir-while-traversing.sh
|
||||
"${SED}" -i '1s/^/exit 0 # Skip test - uutils du uses safe traversal that prevents this race condition\n/' tests/du/move-dir-while-traversing.sh
|
||||
|
||||
awk 'BEGIN {count=0} /compare exp out2/ && count < 6 {sub(/compare exp out2/, "grep -q \"cannot be used with\" out2"); count++} 1' tests/df/df-output.sh > tests/df/df-output.sh.tmp && mv tests/df/df-output.sh.tmp tests/df/df-output.sh
|
||||
|
||||
# with ls --dired, in case of error, we have a slightly different error position
|
||||
sed -i -e "s|44 45|48 49|" tests/ls/stat-failed.sh
|
||||
"${SED}" -i -e "s|44 45|48 49|" tests/ls/stat-failed.sh
|
||||
|
||||
# small difference in the error message
|
||||
# Use GNU sed for /c command
|
||||
"${SED}" -i -e "s/ls: invalid argument 'XX' for 'time style'/ls: invalid --time-style argument 'XX'/" \
|
||||
-e "s/Valid arguments are:/Possible values are:/" \
|
||||
-e "s/Try 'ls --help' for more information./\nFor more information try --help/" \
|
||||
|
|
@ -306,30 +304,29 @@ sed -i -e "s|44 45|48 49|" tests/ls/stat-failed.sh
|
|||
# disable two kind of tests:
|
||||
# "hostid BEFORE --help" doesn't fail for GNU. we fail. we are probably doing better
|
||||
# "hostid BEFORE --help AFTER " same for this
|
||||
sed -i -e "s/env \$prog \$BEFORE \$opt > out2/env \$prog \$BEFORE \$opt > out2 #/" -e "s/env \$prog \$BEFORE \$opt AFTER > out3/env \$prog \$BEFORE \$opt AFTER > out3 #/" -e "s/compare exp out2/compare exp out2 #/" -e "s/compare exp out3/compare exp out3 #/" tests/help/help-version-getopt.sh
|
||||
"${SED}" -i -e "s/env \$prog \$BEFORE \$opt > out2/env \$prog \$BEFORE \$opt > out2 #/" -e "s/env \$prog \$BEFORE \$opt AFTER > out3/env \$prog \$BEFORE \$opt AFTER > out3 #/" -e "s/compare exp out2/compare exp out2 #/" -e "s/compare exp out3/compare exp out3 #/" tests/help/help-version-getopt.sh
|
||||
|
||||
# Add debug info + we have less syscall then GNU's. Adjust our check.
|
||||
# Use GNU sed for /c command
|
||||
"${SED}" -i -e '/test \$n_stat1 = \$n_stat2 \\/c\
|
||||
echo "n_stat1 = \$n_stat1"\n\
|
||||
echo "n_stat2 = \$n_stat2"\n\
|
||||
test \$n_stat1 -ge \$n_stat2 \\' tests/ls/stat-free-color.sh
|
||||
|
||||
# no need to replicate this output with hashsum
|
||||
sed -i -e "s|Try 'md5sum --help' for more information.\\\n||" tests/cksum/md5sum.pl
|
||||
"${SED}" -i -e "s|Try 'md5sum --help' for more information.\\\n||" tests/cksum/md5sum.pl
|
||||
|
||||
# Our ls command always outputs ANSI color codes prepended with a zero. However,
|
||||
# in the case of GNU, it seems inconsistent. Nevertheless, it looks like it
|
||||
# doesn't matter whether we prepend a zero or not.
|
||||
sed -i -E 's/\^\[\[([1-9]m)/^[[0\1/g; s/\^\[\[m/^[[0m/g' tests/ls/color-norm.sh
|
||||
"${SED}" -i -E 's/\^\[\[([1-9]m)/^[[0\1/g; s/\^\[\[m/^[[0m/g' tests/ls/color-norm.sh
|
||||
# It says in the test itself that having more than one reset is a bug, so we
|
||||
# don't need to replicate that behavior.
|
||||
sed -i -E 's/(\^\[\[0m)+/\^\[\[0m/g' tests/ls/color-norm.sh
|
||||
"${SED}" -i -E 's/(\^\[\[0m)+/\^\[\[0m/g' tests/ls/color-norm.sh
|
||||
|
||||
# GNU's ls seems to output color codes in the order given in the environment
|
||||
# variable, but our ls seems to output them in a predefined order. Nevertheless,
|
||||
# the order doesn't matter, so it's okay.
|
||||
sed -i 's/44;37/37;44/' tests/ls/multihardlink.sh
|
||||
"${SED}" -i 's/44;37/37;44/' tests/ls/multihardlink.sh
|
||||
|
||||
# Just like mentioned in the previous patch, GNU's ls output color codes in the
|
||||
# same way it is specified in the environment variable, but our ls emits them
|
||||
|
|
@ -338,24 +335,24 @@ sed -i 's/44;37/37;44/' tests/ls/multihardlink.sh
|
|||
# individually, for example, ^[[31^[[42 instead of ^[[31;42, but we don't do
|
||||
# that anywhere in our implementation, and it looks like GNU's ls also doesn't
|
||||
# do that. So, it's okay to ignore the zero.
|
||||
sed -i "s/color_code='0;31;42'/color_code='31;42'/" tests/ls/color-clear-to-eol.sh
|
||||
"${SED}" -i "s/color_code='0;31;42'/color_code='31;42'/" tests/ls/color-clear-to-eol.sh
|
||||
|
||||
# patching this because of the same reason as the last one.
|
||||
sed -i "s/color_code='0;31;42'/color_code='31;42'/" tests/ls/quote-align.sh
|
||||
"${SED}" -i "s/color_code='0;31;42'/color_code='31;42'/" tests/ls/quote-align.sh
|
||||
|
||||
# Slightly different error message
|
||||
sed -i 's/not supported/unexpected argument/' tests/mv/mv-exchange.sh
|
||||
"${SED}" -i 's/not supported/unexpected argument/' tests/mv/mv-exchange.sh
|
||||
# Most tests check that `/usr/bin/tr` is working correctly before running.
|
||||
# However in NixOS/Nix-based distros, the tr util is located somewhere in
|
||||
# /nix/store/xxxxxxxxxxxx...xxxx/bin/tr
|
||||
# We just replace the references to `/usr/bin/tr`
|
||||
sed -i 's/\/usr\/bin\/tr/$(command -v tr)/' tests/init.sh
|
||||
"${SED}" -i 's/\/usr\/bin\/tr/$(command -v tr)/' tests/init.sh
|
||||
|
||||
# upstream doesn't having the program name in the error message
|
||||
# but we do. We should keep it that way.
|
||||
sed -i 's/echo "changing security context/echo "chcon: changing security context/' tests/chcon/chcon.sh
|
||||
"${SED}" -i 's/echo "changing security context/echo "chcon: changing security context/' tests/chcon/chcon.sh
|
||||
|
||||
# Disable this test, it is not relevant for us:
|
||||
# * the selinux crate is handling errors
|
||||
# * the test says "maybe we should not fail when no context available"
|
||||
sed -i -e "s|returns_ 1||g" tests/cp/no-ctx.sh
|
||||
"${SED}" -i -e "s|returns_ 1||g" tests/cp/no-ctx.sh
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue