From: Jim Meyering <jim@meyering.net>
Date: Sat, 12 Aug 2000 13:22:59 +0000 (+0000)
Subject: Remove test for the VERSION_CONTROL and/or
X-Git-Tag: FILEUTILS-4_0y~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52f183032939e2be70796d9d882c0fff58e8557a;p=thirdparty%2Fcoreutils.git

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 2437d5aef3..084dd1e540 100755
--- 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