Skip to content

Commit b13bf37

Browse files
committed
util/build-gnu.sh: Change string matching for tests/ls/time-style-diag.sh
We now are closer to what GNU prints, and handle the [posix-] cases that they do.
1 parent 4cb57fb commit b13bf37

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

util/build-gnu.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,10 @@ sed -i -e "s|44 45|48 49|" tests/ls/stat-failed.sh
329329

330330
# small difference in the error message
331331
# Use GNU sed for /c command
332-
"${SED}" -i -e "/ls: invalid argument 'XX' for 'time style'/,/Try 'ls --help' for more information\./c\
333-
ls: invalid --time-style argument 'XX'\nPossible values are: [\"full-iso\", \"long-iso\", \"iso\", \"locale\", \"+FORMAT (e.g., +%H:%M) for a 'date'-style format\"]\n\nFor more information try --help" tests/ls/time-style-diag.sh
332+
"${SED}" -i -e "s/ls: invalid argument 'XX' for 'time style'/ls: invalid --time-style argument 'XX'/" \
333+
-e "s/Valid arguments are:/Possible values are:/" \
334+
-e "s/Try 'ls --help' for more information./\nFor more information try --help/" \
335+
tests/ls/time-style-diag.sh
334336

335337
# disable two kind of tests:
336338
# "hostid BEFORE --help" doesn't fail for GNU. we fail. we are probably doing better

0 commit comments

Comments
 (0)