* 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

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index cee7a271aad3005d02065cbbcbf49fda37212c83..852bc20508dd45fb8054b8536d94f5280922807a 100644 (file)
--- 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 2edde67ed8ca5fab1c267e66b7bb6d042c9737e6..ae501300955da49bd1d6b045efb72b1ab801086d 100644 (file)
--- 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 fe8be02738f85837906b5cb7605e81b4a8cccaad..e321c7697737d63293b6ea04424398ab8c1ff834 100644 (file)
--- 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 e56ebad912f2bbea3015174b10a0415676cb96d9..14fe892d481df173a78d85e19f8b94451e2e8437 100644 (file)
--- 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 883aad766a4db7214d71a070f6bdcaa355ea70b1..d38a42f523f772464cafe5ccdfee5a379986c170 100644 (file)
--- 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 cfe6ab6469b4f3d71cf5f0860a7b94616c731e6f..4088f35ec77096a6d425d20ef2f2c27eac597bf0 100644 (file)
--- 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 a5f313ead7bb118be0e980e793033fedb567b9f8..9542fada8499680c08e74e736713c71df79ac354 100644 (file)
--- 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 e07609a1f3953e753fbb3f293a62be5197dfc2dd..75ae7f1118dea5cdf75cbd5a3e3f9241be41666f 100644 (file)
--- 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