From 28c6609c86191b9c913cd124437cad1dac4fd5e7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sun, 22 Oct 2000 13:09:28 +0000
Subject: Source lang-default rather than open-coding the setting/exporting of
 LANG, LC_ALL, and LANGUAGE.

---
 tests/mv/backup-is-src  |  7 +------
 tests/mv/diag           |  7 +------
 tests/mv/force          |  7 +------
 tests/mv/hard-link-1    |  7 +------
 tests/mv/i-2            |  7 +------
 tests/mv/into-self      |  7 +------
 tests/mv/into-self-2    |  7 +------
 tests/mv/into-self-3    |  7 +------
 tests/mv/mv-special-1   | 10 ++--------
 tests/mv/part-symlink   |  5 +----
 tests/mv/partition-perm |  5 +++--
 11 files changed, 14 insertions(+), 62 deletions(-)

(limited to 'tests/mv')

diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src
index 90c0bf3b8..7f1e62326 100755
--- 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 83714fff7..c3fc1b0f9 100755
--- 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 1455ef342..9a101e406 100755
--- 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 2f4b792a0..3b077ea4f 100755
--- 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 2d4cbee3a..72f26ed9a 100755
--- 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 fe48b4f4d..089d160bc 100755
--- 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 81e151af6..7c8a3404c 100755
--- 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 94de9c8d3..8641468ef 100755
--- 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 39df45e95..412e1e6f6 100755
--- 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 254159b89..f2514c297 100755
--- 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 08eb69b35..3b87676c8 100755
--- 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-$$
-- 
cgit v1.2.3-54-g00ecf