tests: don't source envvar-check manually, test-lib.sh does it

* tests/cp/abuse: Remove ". $top_srcdir/tests/envvar-check".
* tests/cp/parent-perm: Likewise.
* tests/cp/special-f: Likewise.
* tests/ls/proc-selinux-segfault: Likewise.
* tests/misc/help-version: Likewise.
* tests/mkdir/selinux: Likewise.
* tests/mv/sticky-to-xpart: Likewise.
* tests/touch/now-owned-by-other: Likewise.
* tests/sample-test: Remove commented out suggestion.

diff --git a/tests/cp/abuse b/tests/cp/abuse
index f4f215f4230e0333c49088e8fe7e526fa4822d48..737a3ebab5293fb68cfda58e3d39544bf904d8a5 100755 (executable)
--- a/tests/cp/abuse
+++ b/tests/cp/abuse
@@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then
   cp --version
 fi
 
-. $top_srcdir/tests/envvar-check
 . $top_srcdir/tests/lang-default
 . $top_srcdir/tests/test-lib.sh
 

diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm
index d2c2533cc3bac80832bdbea6eee2e45fda341527..77bcf758474efdb74d2d9daa652a3ec350a9acee 100755 (executable)
--- a/tests/cp/parent-perm
+++ b/tests/cp/parent-perm
@@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then
   cp --version
 fi
 
-. $top_srcdir/tests/envvar-check
 . $top_srcdir/tests/test-lib.sh
 
 working_umask_or_skip_

diff --git a/tests/cp/special-f b/tests/cp/special-f
index cf684e3620bff6bb715d21a5f292593d35be0dbb..a2e67ba40455b1d6a6836eab1de3e18b03eda9ec 100755 (executable)
--- a/tests/cp/special-f
+++ b/tests/cp/special-f
@@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then
   cp --version
 fi
 
-. $top_srcdir/tests/envvar-check
 . $top_srcdir/tests/lang-default
 . $top_srcdir/tests/test-lib.sh
 

diff --git a/tests/ls/proc-selinux-segfault b/tests/ls/proc-selinux-segfault
index 60cfe55096303da276a4bfe94829dcc2c6baaeba..79ea5235dcba3847aa85f66c86a3823766bb3107 100755 (executable)
--- a/tests/ls/proc-selinux-segfault
+++ b/tests/ls/proc-selinux-segfault
@@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then
   ls --version
 fi
 
-. $top_srcdir/tests/envvar-check
 . $top_srcdir/tests/test-lib.sh
 
 f=/proc/sys

diff --git a/tests/misc/help-version b/tests/misc/help-version
index da900a56e0d569ee2bd907c9b097c17de3ba3bb6..25364dfd237446ebe3a8a1ec96f8faf0cb80405a 100755 (executable)
--- a/tests/misc/help-version
+++ b/tests/misc/help-version
@@ -25,7 +25,6 @@ test "$VERBOSE" = yes && set -x
 test "x$SHELL" = x && SHELL=/bin/sh
 export SHELL
 
-. $top_srcdir/tests/envvar-check
 . $top_srcdir/tests/test-lib.sh
 
 expected_failure_status_nohup=127

diff --git a/tests/mkdir/selinux b/tests/mkdir/selinux
index c81669d6172071cecda9e1add9610e43b447b16f..f0795b1ed8dc824b461337a9361d209be02b53b1 100755 (executable)
--- a/tests/mkdir/selinux
+++ b/tests/mkdir/selinux
@@ -27,7 +27,6 @@ fi
 # mcstrans-0.2.8-1.fc9, the following commands may mistakenly exit
 # successfully, in spite of the invalid context string.
 
-. $top_srcdir/tests/envvar-check
 . $top_srcdir/tests/lang-default
 . $top_srcdir/tests/test-lib.sh
 

diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart
index 1578ae8498f43bc1bbe69ed88339fdcff65562a3..940770b63b0231a6df7dac15f29389cb5412d439 100755 (executable)
--- a/tests/mv/sticky-to-xpart
+++ b/tests/mv/sticky-to-xpart
@@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then
   mv --version
 fi
 
-. $top_srcdir/tests/envvar-check
 . $top_srcdir/tests/lang-default
 . $top_srcdir/tests/test-lib.sh
 require_root_

diff --git a/tests/sample-test b/tests/sample-test
index c081504a806b21a831183dc3ea28fcd2489f3068..e6ef5b6fac60a1a9ef7164438df5d91e955b14ac 100644 (file)
--- a/tests/sample-test
+++ b/tests/sample-test
@@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then
   FIXME --version
 fi
 
-# FIXME: . $top_srcdir/tests/envvar-check
 # FIXME: . $top_srcdir/tests/lang-default
 . $top_srcdir/tests/test-lib.sh
 # FIXME: skip_if_root_

diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other
index 7aaa4f3a0f785fd403fd292643f8f0f88a8a0b5f..2f85850bb93c6fb9cd5051c09063029ae0501f10 100755 (executable)
--- a/tests/touch/now-owned-by-other
+++ b/tests/touch/now-owned-by-other
@@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then
   touch --version
 fi
 
-. $top_srcdir/tests/envvar-check
 . $top_srcdir/tests/test-lib.sh
 require_root_