diff options
| author | Jim Meyering <jim@meyering.net> | 2000-10-22 13:09:28 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2000-10-22 13:09:28 +0000 |
| commit | 28c6609c86191b9c913cd124437cad1dac4fd5e7 (patch) | |
| tree | 177035185a56b06161fde8c456055f1e9c828d09 /tests/cp | |
| parent | 43c38af6a1bf3e3ae527b1cb70988e87bb995063 (diff) | |
| download | coreutils-28c6609c86191b9c913cd124437cad1dac4fd5e7.tar.xz | |
Source lang-default rather than open-coding
the setting/exporting of LANG, LC_ALL, and LANGUAGE.
Diffstat (limited to 'tests/cp')
| -rwxr-xr-x | tests/cp/backup-is-src | 7 | ||||
| -rwxr-xr-x | tests/cp/cp-mv-backup | 5 | ||||
| -rwxr-xr-x | tests/cp/same-file | 3 | ||||
| -rwxr-xr-x | tests/cp/slink-2-slink | 7 | ||||
| -rwxr-xr-x | tests/cp/symlink-slash | 4 |
5 files changed, 7 insertions, 19 deletions
diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src index e753e4a59..07741ddcf 100755 --- a/tests/cp/backup-is-src +++ b/tests/cp/backup-is-src @@ -16,12 +16,7 @@ if test $framework_failure = 1; then fi # Make sure we get English translations. -LANGUAGE=C -export LANGUAGE -LC_ALL=C -export LC_ALL -LANG=C -export LANG +. $srcdir/../lang-default # This cp command should exit nonzero. cp --b=simple a~ a > out 2>&1 && fail=1 diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup index fbed6f009..1baadc66b 100755 --- a/tests/cp/cp-mv-backup +++ b/tests/cp/cp-mv-backup @@ -6,11 +6,8 @@ if test "$VERBOSE" = yes; then cp --version fi -LANGUAGE=C; export LANGUAGE -LANG=C; export LANG - # Ensure that ls sorts the same way for everyone. -LC_ALL=C; export LC_ALL +. $srcdir/../lang-default . $srcdir/../envvar-check diff --git a/tests/cp/same-file b/tests/cp/same-file index 6752b4f0e..7ae7ec0bc 100755 --- a/tests/cp/same-file +++ b/tests/cp/same-file @@ -7,8 +7,7 @@ if test "$VERBOSE" = yes; then cp --version fi -LANGUAGE=C; export LANGUAGE -LANG=C; export LANG +. $srcdir/../lang-default VERSION_CONTROL=numbered; export VERSION_CONTROL diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink index 2c9fd4171..90a3f6f2d 100755 --- a/tests/cp/slink-2-slink +++ b/tests/cp/slink-2-slink @@ -10,12 +10,7 @@ fi . $srcdir/../envvar-check # Make sure we get English translations. -LANGUAGE=C -export LANGUAGE -LC_ALL=C -export LC_ALL -LANG=C -export LANG +. $srcdir/../lang-default pwd=`pwd` tmp=sl2sl-$$ diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash index 9370a2b4c..7fb0c0717 100755 --- a/tests/cp/symlink-slash +++ b/tests/cp/symlink-slash @@ -7,6 +7,8 @@ if test "$VERBOSE" = yes; then cp --version fi +. $srcdir/../lang-default + tmp=t-cpsymsl.$$ framework_failure=0 @@ -23,7 +25,7 @@ fi fail=0 cp -dR symlink/ s || fail=1 -set `LANGUAGE=C LC_ALL=C ls -l s` +set `ls -l s` # Prior to fileutils-4.0q, the following would have output ...`s -> dir' # because the trailing slash was removed unconditionally (now you have to |