Remove test for the VERSION_CONTROL and/or

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

diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink
index 3b0db9ab7aae37724944d581fb13c4ba600c3e79..2c9fd417139fb3962e26d0c433bee5c121e0a076 100755 (executable)
--- a/tests/cp/slink-2-slink
+++ b/tests/cp/slink-2-slink
@@ -7,12 +7,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/partition-perm b/tests/mv/partition-perm
index ef5882ba21fae623581194af44d861b77eca1f01..08eb69b350fa6d98f7d2a8bb14ca08865ab4da35 100755 (executable)
--- a/tests/mv/partition-perm
+++ b/tests/mv/partition-perm
@@ -7,6 +7,7 @@ if test "$VERBOSE" = yes; then
 fi
 
 . $srcdir/setup
+. $srcdir/../envvar-check
 
 if test -z "$other_partition_tmpdir"; then
   exit 77
@@ -20,20 +21,6 @@ dir=p-perm-$$
 trap "cd $pwd; rm -rf $dir $other_partition_tmpdir" 0 1 2 3 15
 
 mkdir $dir
-unset VERSION_CONTROL SIMPLE_BACKUP_SUFFIX
-
-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
-
-if test "${SIMPLE_BACKUP_SUFFIX+set}" = set; then
-  echo '$0: the SIMPLE_BACKUP_SUFFIX envvar is set --' \
-    ' unset it and rerun this test' >&2
-    >&2
-  exit 1
-fi
 
 cd $dir
 : > file