* env-setup.shin, init_db, save_files.sh, start_servers,

 	start_servers_local, stop_servers, stop_servers_local: move
 	VERBOSE_TEST -> VERBOSE logic to env-setup.sh, make everything
 	else inherit from it, and fix the sense of the test (Tom got it
 	backwards); also fix init_db so that kdb5_util create is not
 	always verbose

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9417 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 19 insertions, 49 deletions

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index cee7a27..852bc20 100644
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,12 @@
+Thu Nov 14 15:28:16 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+	* env-setup.shin, init_db, save_files.sh, start_servers,
+ 	start_servers_local, stop_servers, stop_servers_local: move
+ 	VERBOSE_TEST -> VERBOSE logic to env-setup.sh, make everything
+ 	else inherit from it, and fix the sense of the test (Tom got it
+ 	backwards); also fix init_db so that kdb5_util create is not
+ 	always verbose
+
 Wed Nov 13 17:12:51 1996  Tom Yu  <tlyu@mit.edu>
 
 	* env-setup.shin: Explicitly set KRB5CCNAME so the user's ccache
diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index 2edde67..ae50130 100644
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -34,6 +34,15 @@ if [ "$K5ROOT" = "" ]; then
 	export K5ROOT
 fi
 
+# If $VERBOSE_TEST is non-null, enter verbose mode.  Set $VERBOSE to
+# true or false so its exit status identifies the mode.
+if test x$VERBOSE_TEST = x; then
+	VERBOSE=false
+else
+	VERBOSE=true
+fi
+export VERBOSE
+
 REALM=SECURE-TEST.OV.COM; export REALM
 
 EXPECT=@EXPECT@; export EXPECT
diff --git a/src/kadmin/testing/scripts/init_db b/src/kadmin/testing/scripts/init_db
index fe8be02..e321c76 100644
--- a/src/kadmin/testing/scripts/init_db
+++ b/src/kadmin/testing/scripts/init_db
@@ -1,13 +1,5 @@
 #!/bin/sh
 
-# If it's set, set it to true
-if test x$VERBOSE_TEST = x; then
-	VERBOSE=true
-# Otherwise, set it to false
-else
-	VERBOSE=false
-fi
-
 if $VERBOSE; then
 	REDIRECT=
 else
@@ -68,7 +60,7 @@ sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
 sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
 	< $STESTDIR/proto/kdc.conf.proto > $K5ROOT/kdc.conf
 
-kdb5_util -r $REALM create -P mrroot -s $REDIRECT
+eval kdb5_util -r $REALM create -P mrroot -s $REDIRECT
 
 cp $STESTDIR/proto/ovsec_adm.dict $K5ROOT/ovsec_adm.dict
 
diff --git a/src/kadmin/testing/scripts/save_files.sh b/src/kadmin/testing/scripts/save_files.sh
index e56ebad..14fe892 100644
--- a/src/kadmin/testing/scripts/save_files.sh
+++ b/src/kadmin/testing/scripts/save_files.sh
@@ -9,14 +9,6 @@ while [ $# -gt 0 ] ; do
 	shift
 done
 
-# If it's set, set it to true
-if test x$VERBOSE_TEST = x; then
-	VERBOSE=true
-# Otherwise, set it to false
-else
-	VERBOSE=false
-fi
-
 # files="/etc/inetd.conf /etc/syslog.conf /etc/krb.conf \
 # 	/etc/krb.realms /etc/passwd /etc/services /etc/v5srvtab \
 # 	/etc/rc.local /etc/shadow /etc/security/passwd /.k5login \
diff --git a/src/kadmin/testing/scripts/start_servers b/src/kadmin/testing/scripts/start_servers
index 883aad7..d38a42f 100644
--- a/src/kadmin/testing/scripts/start_servers
+++ b/src/kadmin/testing/scripts/start_servers
@@ -17,14 +17,6 @@ DUMMY=${START_SERVERS_LOCAL=$STESTDIR/scripts/start_servers_local}
 # This'll be wrong sometimes
 DUMMY=${RSH_CMD=rsh}
 
-# If it's set, set it to true
-if test x$VERBOSE_TEST = x; then
-	VERBOSE=true
-# Otherwise, set it to false
-else
-	VERBOSE=false
-fi
-
 local=1
 
 if [ $# -gt 0 ]; then
diff --git a/src/kadmin/testing/scripts/start_servers_local b/src/kadmin/testing/scripts/start_servers_local
index cfe6ab6..4088f35 100644
--- a/src/kadmin/testing/scripts/start_servers_local
+++ b/src/kadmin/testing/scripts/start_servers_local
@@ -17,14 +17,6 @@ fi
 
 $STOP_SERVERS_LOCAL -start_servers
 
-# If it's set, set it to true
-if test x$VERBOSE_TEST = x; then
-	VERBOSE=true
-# Otherwise, set it to false
-else
-	VERBOSE=false
-fi
-
 if $VERBOSE; then
 	REDIRECT=
 else
diff --git a/src/kadmin/testing/scripts/stop_servers b/src/kadmin/testing/scripts/stop_servers
index a5f313e..9542fad 100644
--- a/src/kadmin/testing/scripts/stop_servers
+++ b/src/kadmin/testing/scripts/stop_servers
@@ -17,14 +17,6 @@ DUMMY=${STOP_SERVERS_LOCAL=$STESTDIR/scripts/stop_servers_local}
 DUMMY=${RSH_CMD=rsh}
 DUMMY=${RESTORE_FILES=$TESTDIR/scripts/restore_files.sh}
 
-# If it's set, set it to true
-if test x$VERBOSE_TEST = x; then
-	VERBOSE=true
-# Otherwise, set it to false
-else
-	VERBOSE=false
-fi
-
 local=1
 
 if [ $# -gt 0 ]; then
diff --git a/src/kadmin/testing/scripts/stop_servers_local b/src/kadmin/testing/scripts/stop_servers_local
index e07609a..75ae7f1 100644
--- a/src/kadmin/testing/scripts/stop_servers_local
+++ b/src/kadmin/testing/scripts/stop_servers_local
@@ -3,14 +3,6 @@
 DUMMY=${TESTDIR=$TOP/testing}
 DUMMY=${RESTORE_FILES=$TESTDIR/scripts/restore_files.sh}
 
-# If it's set, set it to true
-if test x$VERBOSE_TEST = x; then
-	VERBOSE=true
-# Otherwise, set it to false
-else
-	VERBOSE=false
-fi
-
 v4files=false
 while [ $# -gt 0 ] ; do
 	case $1 in