svn rev #23838: trunk/src/ kadmin/testing/scripts/ tests/ tests/dejagnu/config/ ...

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23838
Commit By: raeburn
Log Message:
Always pass -W option to kdb5_util create in testing.


Changed Files:
U   trunk/src/kadmin/testing/scripts/init_db
U   trunk/src/tests/Makefile.in
U   trunk/src/tests/dejagnu/config/default.exp
U   trunk/src/tests/mkeystash_compat/Makefile.in
Modified: trunk/src/kadmin/testing/scripts/init_db
===================================================================
--- trunk/src/kadmin/testing/scripts/init_db	2010-03-26 22:43:11 UTC (rev 23837)
+++ trunk/src/kadmin/testing/scripts/init_db	2010-03-27 21:30:43 UTC (rev 23838)
@@ -87,7 +87,7 @@
 sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
 	< $STESTDIR/proto/kdc.conf.proto > $K5ROOT/kdc.conf
 
-eval kdb5_util -r $REALM create -P mrroot -s $REDIRECT || exit 1
+eval kdb5_util -r $REALM create -W -P mrroot -s $REDIRECT || exit 1
 
 cp $STESTDIR/proto/ovsec_adm.dict $K5ROOT/ovsec_adm.dict
 

Modified: trunk/src/tests/Makefile.in
===================================================================
--- trunk/src/tests/Makefile.in	2010-03-26 22:43:11 UTC (rev 23837)
+++ trunk/src/tests/Makefile.in	2010-03-27 21:30:43 UTC (rev 23838)
@@ -36,7 +36,7 @@
 
 kdb_check: kdc.conf krb5.conf
 	$(RM) $(TEST_DB)*
-	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create
+	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create -W
 	$(RUN_SETUP) $(VALGRIND) ../tests/create/kdb5_mkdums $(KTEST_OPTS) 
 	$(RUN_SETUP) $(VALGRIND) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
 	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) dump $(TEST_DB).dump
@@ -46,7 +46,7 @@
 	@echo "The following 'create' command is needed due to a change"
 	@echo "in functionality caused by DAL integration.  See ticket 3973."
 	@echo ====
-	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create
+	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create -W
 	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) load $(TEST_DB).dump 
 	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) load -update -ov $(TEST_DB).ovdump 
 	$(RUN_SETUP) $(VALGRIND) ../tests/verify/kdb5_verify $(KTEST_OPTS) 

Modified: trunk/src/tests/dejagnu/config/default.exp
===================================================================
--- trunk/src/tests/dejagnu/config/default.exp	2010-03-26 22:43:11 UTC (rev 23837)
+++ trunk/src/tests/dejagnu/config/default.exp	2010-03-27 21:30:43 UTC (rev 23838)
@@ -1411,7 +1411,7 @@
 	}
 	#exec xterm
 	verbose "starting $test"
-	spawn $KDB5_UTIL -r $REALMNAME create
+	spawn $KDB5_UTIL -r $REALMNAME create -W
 	expect_after $def_exp_after
 
 	expect "Enter KDC database master key:"

Modified: trunk/src/tests/mkeystash_compat/Makefile.in
===================================================================
--- trunk/src/tests/mkeystash_compat/Makefile.in	2010-03-26 22:43:11 UTC (rev 23837)
+++ trunk/src/tests/mkeystash_compat/Makefile.in	2010-03-27 21:30:43 UTC (rev 23838)
@@ -38,7 +38,7 @@
 # Verify that the mkey stash code is backward compat with old/non-keytab stashfile format
 mkeystash_check: kdc.conf krb5.conf bigendian
 	$(RM) $(TEST_DB)* stash_file
-	$(RUN_SETUP) $(VALGRIND) ../../kadmin/dbutil/kdb5_util $(KDB_OPTS) create -s
+	$(RUN_SETUP) $(VALGRIND) ../../kadmin/dbutil/kdb5_util $(KDB_OPTS) create -s -W
 	# overwrite keytab stash file with old format stash, depends on endianness of current test system
 	./bigendian && cp $(srcdir)/old_stash_bendian stash_file || cp $(srcdir)/old_stash_lendian stash_file
 	# getprinc will fail if old stash file can not be read