From ba2948b76496486bac9d0681145dbd912af80b6e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 11 Jun 2006 08:12:37 +0000 Subject: [PATCH] Setting TIME_STYLE=long-iso in the environment would make the cp/same-file test fail. * tests/envvar-check (vars): Add TIME_STYLE to the list. * tests/cp/same-file: Revert last change. Source the envvar-check script, to ensure that TIME_STYLE settings don't affect these tests. --- ChangeLog | 9 +++++++++ tests/cp/same-file | 3 ++- tests/envvar-check | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 935daff..e2debfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-06-11 Jim Meyering + + Setting TIME_STYLE=long-iso in the environment would make the + cp/same-file test fail. + * tests/envvar-check (vars): Add TIME_STYLE to the list. + * tests/cp/same-file: Revert last change. + Source the envvar-check script, to ensure that TIME_STYLE + settings don't affect these tests. + 2006-06-11 Paul Eggert * tests/cp/same-file: Execute 'ls' in the C locale, so that it diff --git a/tests/cp/same-file b/tests/cp/same-file index 2cba869..a08c4e3 100755 --- a/tests/cp/same-file +++ b/tests/cp/same-file @@ -8,6 +8,7 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../lang-default +. $srcdir/../envvar-check # Unset CDPATH. Otherwise, output from the `cd dir' command # can make this test fail. @@ -74,7 +75,7 @@ for args in 'foo symlink' 'symlink foo' 'foo foo' 'sl1 sl2' 'foo hardlink'; do # and put brackets around the output. test -s _err && echo "[`sed 's/^[^:][^:]*:/cp:/' _err`]" # Strip off all but the file names. - ls="`LC_ALL=C ls -gG --ignore=_err . \ + ls="`ls -gG --ignore=_err . \ | sed \ -e '/^total /d' \ -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'`" diff --git a/tests/envvar-check b/tests/envvar-check index 406a069..9bc44e2 100644 --- a/tests/envvar-check +++ b/tests/envvar-check @@ -13,6 +13,7 @@ vars=' DU_BLOCK_SIZE LS_BLOCK_SIZE SIMPLE_BACKUP_SUFFIX + TIME_STYLE VERSION_CONTROL ' for var in $vars -- 2.7.4