From: Jim Meyering <jim@meyering.net>
Date: Sat, 12 Aug 2000 13:22:19 +0000 (+0000)
Subject: Remove test for the VERSION_CONTROL and/or
X-Git-Tag: FILEUTILS-4_0y~48
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=af77319c56cfa2e9b53d3df2e5daffc581ce732f;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/slink-2-slink b/tests/cp/slink-2-slink
index 3b0db9ab7a..2c9fd41713 100755
--- 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 ef5882ba21..08eb69b350 100755
--- 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