Remove test for the VERSION_CONTROL and/or

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

diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup
index 2437d5aef35ce8ae56aa2efa4720a545850a6b3c..084dd1e540af178308d862ddc52eaffdb7eac62e 100755 (executable)
--- a/tests/cp/cp-mv-backup
+++ b/tests/cp/cp-mv-backup
@@ -9,6 +9,8 @@ fi
 LANGUAGE=C; export LANGUAGE
 LANG=C; export LANG
 
+. $srcdir/../envvar-check
+
 umask 022
 
 pwd=`pwd`
@@ -22,20 +24,6 @@ expected=$dir/expected
 trap "cd $pwd; exec 1>&2; rm -rf $dir" 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
 
 exec 1> $actual