Remove test for the VERSION_CONTROL and/or

SIMPLE_BACKUP_SUFFIX envvars.  Source ../envvar-check instead.

diff --git a/tests/mv/i-2 b/tests/mv/i-2
index f7076d0..2d4cbee 100755 (executable)
--- a/tests/mv/i-2
+++ b/tests/mv/i-2
@@ -8,12 +8,7 @@ if test "$VERBOSE" = yes; then
   cp --version
 fi
 
-unset VERSION_CONTROL
-if test "${VERSION_CONTROL+set}" = set; then
-  echo '$0: the VERSION_CONTROL envvar is set --' \
-    ' unset it and rerun this test' >&2
-  exit 1
-fi
+. $srcdir/../envvar-check
 
 # Make sure we get English translations.
 LANGUAGE=C

diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2
index 9e51787..81e151a 100755 (executable)
--- a/tests/mv/into-self-2
+++ b/tests/mv/into-self-2
@@ -9,6 +9,7 @@ if test "$VERBOSE" = yes; then
 fi
 
 . $srcdir/setup
+. $srcdir/../envvar-check
 
 if test -z "$other_partition_tmpdir"; then
   exit 77
@@ -40,14 +41,6 @@ export LC_ALL
 LANG=C
 export LANG
 
-unset VERSION_CONTROL
-
-if test "${VERSION_CONTROL+set}" = set; then
-  echo '$0: the VERSION_CONTROL envvar is set --' \
-    ' unset it and rerun this test' >&2
-  exit 1
-fi
-
 # This mv command should exit nonzero.
 mv $symlink $file > out 2>&1 && fail=1