From 972e2737abf30c522c029051a13354756413ea46 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 25 Apr 2008 14:39:38 +0200 Subject: [PATCH] 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. --- tests/cp/abuse | 1 - tests/cp/parent-perm | 1 - tests/cp/special-f | 1 - tests/ls/proc-selinux-segfault | 1 - tests/misc/help-version | 1 - tests/mkdir/selinux | 1 - tests/mv/sticky-to-xpart | 1 - tests/sample-test | 1 - tests/touch/now-owned-by-other | 1 - 9 files changed, 9 deletions(-) diff --git a/tests/cp/abuse b/tests/cp/abuse index f4f215f423..737a3ebab5 100755 --- 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 d2c2533cc3..77bcf75847 100755 --- 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 cf684e3620..a2e67ba404 100755 --- 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 60cfe55096..79ea5235dc 100755 --- 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 da900a56e0..25364dfd23 100755 --- 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 c81669d617..f0795b1ed8 100755 --- 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 1578ae8498..940770b63b 100755 --- 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 c081504a80..e6ef5b6fac 100644 --- 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 7aaa4f3a0f..2f85850bb9 100755 --- 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_ -- 2.47.3