Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 07:12:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3630 from sylvestre/gnu-sleep

Browse source 
sleep: customize one of the tests (tests/misc/sleep.sh)
This commit is contained in:
Terts Diepraam 2022-06-15 19:50:33 +02:00 committed by GitHub
commit bc4f193b5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/uu/sleep/src/sleep.rs
View file

@ -31,7 +31,7 @@ mod options {
#[uucore::main] #[uucore::main]
pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let matches = uu_app().get_matches_from(args); let matches = uu_app().try_get_matches_from(args)?;
if let Some(values) = matches.values_of(options::NUMBER) { if let Some(values) = matches.values_of(options::NUMBER) {
let numbers = values.collect::<Vec<_>>(); let numbers = values.collect::<Vec<_>>();

7
util/build-gnu.sh
View file

@ -66,7 +66,6 @@ if test -f gnu-built; then
echo "GNU build already found. Skip" echo "GNU build already found. Skip"
echo "'rm -f $(pwd)/gnu-built' to force the build" echo "'rm -f $(pwd)/gnu-built' to force the build"
echo "Note: the customization of the tests will still happen" echo "Note: the customization of the tests will still happen"
exit 0
else else
./bootstrap ./bootstrap
./configure --quiet --disable-gcc-warnings ./configure --quiet --disable-gcc-warnings
@ -199,4 +198,8 @@ sed -i -e "s/provoked error./provoked error\ncat pat |sort -u > pat/" tests/misc
# Update the GNU error message to match ours # Update the GNU error message to match ours
sed -i -e "s/ln: 'f' and 'f' are the same file/ln: failed to link 'f' to 'f': Same file/g" tests/ln/hard-backup.sh sed -i -e "s/ln: 'f' and 'f' are the same file/ln: failed to link 'f' to 'f': Same file/g" tests/ln/hard-backup.sh
sed -i -e "s/failed to access 'no-such-dir'\":/failed to link 'no-such-dir'\"/" -e "s/link-to-dir: hard link not allowed for directory/failed to link 'link-to-dir' to/" -e "s|link-to-dir/: hard link not allowed for directory|failed to link 'link-to-dir/' to|" tests/ln/hard-to-sym.sh sed -i -e "s/failed to access 'no-such-dir'\":/failed to link 'no-such-dir'\"/" -e "s/link-to-dir: hard link not allowed for directory/failed to link 'link-to-dir' to/" -e "s|link-to-dir/: hard link not allowed for directory|failed to link 'link-to-dir/' to|" tests/ln/hard-to-sym.sh
# sleep without arg returns 2 on our side, 1 on GNU's
# GNU sleep accepts some crazy string, not sure we should match this behavior
sed -i -e "s/timeout 10 sleep 0x.002p1/#timeout 10 sleep 0x.002p1/" tests/misc/sleep.sh