Source lang-default rather than open-coding

the setting/exporting of LANG, LC_ALL, and LANGUAGE.

diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src
index e753e4a59e5251e7df53dfd266590ae2cc45d9c1..07741ddcf76d0559c1c3a0e492a66ce9171f0a8e 100755 (executable)
--- 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 fbed6f00957bc9ae5c0afb04ebf5ec0670e7a6cc..1baadc66b6a000743310576a321c7443dbf57349 100755 (executable)
--- 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 6752b4f0ed757dbc3a2b988e4db876a5d48d3936..7ae7ec0bca5e892ea78868172d42f8ee260f19fd 100755 (executable)
--- 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 2c9fd417139fb3962e26d0c433bee5c121e0a076..90a3f6f2d876b62a6df0ee035168a51a15d1c293 100755 (executable)
--- 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 9370a2b4c8bb1e06df5a85c33cc7dd2c02c3ffd6..7fb0c0717a5cabcceaf7d019d5b490f1fd66d146 100755 (executable)
--- 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

diff --git a/tests/ln/sf-1 b/tests/ln/sf-1
index 894144a8ba8f3fae38a848c6b36a63b37b77316c..42471160688fe1d55d9be813f1c6b31063d695ca 100755 (executable)
--- a/tests/ln/sf-1
+++ b/tests/ln/sf-1
@@ -21,12 +21,7 @@ if test $test_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
 
 fail=0
 ln -sf a b > err 2>&1 && fail=1

diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash
index ae12b091b9decf41c0b06f84e96305440d132b89..e365f85c70c46c2905699986f8feebcb98516b8e 100755 (executable)
--- a/tests/ls/symlink-slash
+++ b/tests/ls/symlink-slash
@@ -20,8 +20,7 @@ if test $framework_failure = 1; then
   exit 1
 fi
 
-LANGUAGE=C; export LANGUAGE
-LANG=C; export LANG
+. $srcdir/../lang-default
 
 fail=0
 set `ls -l symlink/`

diff --git a/tests/ls/time-1 b/tests/ls/time-1
index c81fcaecf4534124060840c2f789e7a42a0837a7..ba251d71478472413e83f79600b824439d1d75d1 100755 (executable)
--- a/tests/ls/time-1
+++ b/tests/ls/time-1
@@ -46,8 +46,7 @@ ln c d || framework_failure=1
 # Date output in ls -l is locale-sensitive, so this test fails if the
 # current locale produces a date that doesn't match the embedded value
 # here (Jan 15 23:00:00 1998), which is in the C (POSIX) locale.
-LC_ALL=C
-export LC_ALL
+. $srcdir/../lang-default
 
 # Before we go any further, verify that touch's -m option works.
 set -- `ls --full -l a`

diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src
index 90c0bf3b8b81a9cd72aac939376b0a2844b1dc5a..7f1e623266e55a06c4dd34ac69bd19dc70300579 100755 (executable)
--- a/tests/mv/backup-is-src
+++ b/tests/mv/backup-is-src
@@ -26,12 +26,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 mv command should exit nonzero.
 mv --b=simple $a2 $a > out 2>&1 && fail=1

diff --git a/tests/mv/diag b/tests/mv/diag
index 83714fff7da4872cb89d4867db309108049119ca..c3fc1b0f93ab1b63d5e10a3345074f4e893eb46f 100755 (executable)
--- a/tests/mv/diag
+++ b/tests/mv/diag
@@ -25,12 +25,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
 
 # These mv commands should all exit nonzero.
 

diff --git a/tests/mv/force b/tests/mv/force
index 1455ef342627e593bebe6486b64addb1c7ff93a3..9a101e406ec1d1c908e45fd41df4d4add3f421ec 100755 (executable)
--- a/tests/mv/force
+++ b/tests/mv/force
@@ -20,12 +20,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 mv command should exit nonzero.
 mv $ff $ff > out 2>&1 && fail=1

diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1
index 2f4b792a0829f4e8fefaf13ceb13a5f97949f743..3b077ea4f0d88f9091357843028fe37407b938aa 100755 (executable)
--- a/tests/mv/hard-link-1
+++ b/tests/mv/hard-link-1
@@ -26,12 +26,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
 
 mv $dir $other_partition_tmpdir || fail=1
 

diff --git a/tests/mv/i-2 b/tests/mv/i-2
index 2d4cbee3a2123322a460311b7894a2b8d1e0dd31..72f26ed9a36fee99eb46379562cf2e28b2b44da8 100755 (executable)
--- a/tests/mv/i-2
+++ b/tests/mv/i-2
@@ -11,12 +11,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=cp-mv-if-$$

diff --git a/tests/mv/into-self b/tests/mv/into-self
index fe48b4f4d5ce4a50b1b36d47b7a0f8af30585469..089d160bcf30c728c066fe37045a93ff95a789a1 100755 (executable)
--- a/tests/mv/into-self
+++ b/tests/mv/into-self
@@ -23,12 +23,7 @@ fi
 fail=0
 
 # Make sure we get English translations.
-LANGUAGE=C
-export LANGUAGE
-LC_ALL=C
-export LC_ALL
-LANG=C
-export LANG
+. $srcdir/../lang-default
 
 # This mv command should fail.
 mv $dir $file $dir > out 2>&1 && fail=1

diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2
index 81e151af60eff8b09ff1c58cae076d63d0d36562..7c8a3404c811065b6a80d6b89bce4dcbbd057929 100755 (executable)
--- a/tests/mv/into-self-2
+++ b/tests/mv/into-self-2
@@ -34,12 +34,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 mv command should exit nonzero.
 mv $symlink $file > out 2>&1 && fail=1

diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3
index 94de9c8d35a3f5e2e57eefffd3c21b59bdd8a3cc..8641468efbd1f79550fe3591f05850ef251bb7de 100755 (executable)
--- a/tests/mv/into-self-3
+++ b/tests/mv/into-self-3
@@ -19,12 +19,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 mv command should exit nonzero.
 mv $dir1 $dir2 $dir2 > out 2>&1 && fail=1

diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1
index 39df45e95ec3b6c932c263cac31298026896c5f5..412e1e6f6318f5da5ac99966101918772e94ecee 100755 (executable)
--- a/tests/mv/mv-special-1
+++ b/tests/mv/mv-special-1
@@ -1,6 +1,8 @@
 #! /bin/sh
 
 . $srcdir/setup
+# Make sure we get English translations.
+. $srcdir/../lang-default
 
 if test -z "$other_partition_tmpdir"; then
   exit 77
@@ -26,14 +28,6 @@ if test $framework_failure = 1; then
   exit 77
 fi
 
-# Make sure we get English translations.
-LANGUAGE=C
-export LANGUAGE
-LC_ALL=C
-export LC_ALL
-LANG=C
-export LANG
-
 fail=0
 mv --verbose $null $dir $other_partition_tmpdir > out || fail=1
 # Make sure the files are gone.

diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink
index 254159b89e5a08e2ad9cead5decc656ab2a4024c..f2514c297e6efa468811c9038d7379bc4814ec1f 100755 (executable)
--- a/tests/mv/part-symlink
+++ b/tests/mv/part-symlink
@@ -17,11 +17,8 @@ pwd_tmp=$pwd/$tmp
 
 . $srcdir/setup
 . $srcdir/../envvar-check
-
 # Make sure the programs use C-locale formats/translations.
-LANGUAGE=C; export LANGUAGE
-LC_ALL=C; export LC_ALL
-LANG=C; export LANG
+. $srcdir/../lang-default
 
 if test -z "$other_partition_tmpdir"; then
   (exit 77); exit

diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm
index 08eb69b350fa6d98f7d2a8bb14ca08865ab4da35..3b87676c86cd31592005e2127eb78e208c93817d 100755 (executable)
--- a/tests/mv/partition-perm
+++ b/tests/mv/partition-perm
@@ -8,13 +8,14 @@ fi
 
 . $srcdir/setup
 . $srcdir/../envvar-check
+. $srcdir/../lang-default
 
 if test -z "$other_partition_tmpdir"; then
   exit 77
 fi
 
-LANGUAGE=C; export LANGUAGE
-LANG=C; export LANG
+=''; export LANGUAGE
+=''; export LANG
 
 pwd=`pwd`
 dir=p-perm-$$

diff --git a/tests/rm/r-2 b/tests/rm/r-2
index a85c61f3004edb16d237f0145399102cca64e1fa..044dd227940221d3010cd068265b68b814278dca 100755 (executable)
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -18,10 +18,7 @@ mkdir t t/a t/a/b || framework_failure=1
 > t/a/f || framework_failure=1
 > t/a/b/g || framework_failure=1
 
-LANGUAGE=C
-export LANGUAGE
-LC_ALL=C
-export LC_ALL
+. $srcdir/../lang-default
 
 # FIXME: if this fails, it's a framework failure
 cat <<EOF | sort > t/E || framework_failure=1