[gentoo-commits] proj/sandbox:master commit in: tests/

[Mike Frysinger]

commit:     99a9e43c31445464271502e60e99ed6e16a35566
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 01:26:31 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 21:26:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sandbox.git;a=commit;h=99a9e43c

tests: move disabling of sandbox verbose to common init

Since none of our tests care about the verbose output, move the disable
to a common location so we don't have to do it on a more fine grained
basis.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 tests/atlocal.in    |    2 ++
 tests/chmod-1.sh    |    1 -
 tests/chown-1.sh    |    1 -
 tests/fchmodat-1.sh |    1 -
 tests/fchownat-2.sh |    1 -
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 4cabcff..1addcf0 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -17,3 +17,5 @@ export SANDBOX_PREDICT=${SANDBOX_PREDICT%:/}
 if [ "${AUTOTEST_PATH}" = "tests" ] ; then
 	AUTOTEST_PATH="src:tests"
 fi
+
+export SANDBOX_VERBOSE=0

diff --git a/tests/chmod-1.sh b/tests/chmod-1.sh
index 89b57fe..f857eac 100755
--- a/tests/chmod-1.sh
+++ b/tests/chmod-1.sh
@@ -17,6 +17,5 @@ chmod-0 0 link 0666 || exit 1
 # this *should* trigger a sandbox violation
 adddeny $PWD/deny
 export SANDBOX_LOG=$PWD/sb.log
-unset SANDBOX_VERBOSE
 chmod-0 -1 link 0666 || exit 1
 test -s sb.log

diff --git a/tests/chown-1.sh b/tests/chown-1.sh
index ef4de0e..4a4b778 100755
--- a/tests/chown-1.sh
+++ b/tests/chown-1.sh
@@ -17,6 +17,5 @@ chown-0 0 link ${SB_UID} ${SB_GID} || exit 1
 # this *should* trigger a sandbox violation
 adddeny $PWD/deny
 export SANDBOX_LOG=$PWD/sb.log
-unset SANDBOX_VERBOSE
 chown-0 -1 link ${SB_UID} ${SB_GID} || exit 1
 test -s sb.log

diff --git a/tests/fchmodat-1.sh b/tests/fchmodat-1.sh
index 5db4365..570a2bf 100755
--- a/tests/fchmodat-1.sh
+++ b/tests/fchmodat-1.sh
@@ -17,6 +17,5 @@ fchmodat-0 0 AT_FDCWD link 0666 0 || exit 1
 # this *should* trigger a sandbox violation
 adddeny $PWD/deny
 export SANDBOX_LOG=$PWD/sb.log
-unset SANDBOX_VERBOSE
 fchmodat-0 -1 AT_FDCWD link 0666 0 || exit 1
 test -s sb.log

diff --git a/tests/fchownat-2.sh b/tests/fchownat-2.sh
index 9fd68f0..5c67616 100755
--- a/tests/fchownat-2.sh
+++ b/tests/fchownat-2.sh
@@ -17,6 +17,5 @@ fchownat-0 0 AT_FDCWD link ${SB_UID} ${SB_GID} 0 || exit 1
 # this *should* trigger a sandbox violation
 adddeny $PWD/deny
 export SANDBOX_LOG=$PWD/sb.log
-unset SANDBOX_VERBOSE
 fchownat-0 -1 AT_FDCWD link ${SB_UID} ${SB_GID} 0 || exit 1
 test -s sb.log