diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2010-03-27 21:30:43 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2010-03-27 21:30:43 +0000 |
| commit | ccc2543ecf06b31cdd29907b0c5dd00641b12b65 (patch) | |
| tree | c538afd3d38288d3345548fd4bcba1ca830a417c /src/tests | |
| parent | d48873254348c8768602229ae22f404dde8b2b43 (diff) | |
| download | krb5-ccc2543ecf06b31cdd29907b0c5dd00641b12b65.tar.gz krb5-ccc2543ecf06b31cdd29907b0c5dd00641b12b65.tar.xz krb5-ccc2543ecf06b31cdd29907b0c5dd00641b12b65.zip | |
Always pass -W option to kdb5_util create in testing
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23838 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/Makefile.in | 4 | ||||
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 2 | ||||
| -rw-r--r-- | src/tests/mkeystash_compat/Makefile.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 713dd17b2..66a3db076 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -36,7 +36,7 @@ krb5.conf: Makefile 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 @@ kdb_check: kdc.conf krb5.conf @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) diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index cc94718db..382c17409 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -1411,7 +1411,7 @@ proc setup_slave_db { } { } #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:" diff --git a/src/tests/mkeystash_compat/Makefile.in b/src/tests/mkeystash_compat/Makefile.in index faf55c1ea..1785e108f 100644 --- a/src/tests/mkeystash_compat/Makefile.in +++ b/src/tests/mkeystash_compat/Makefile.in @@ -38,7 +38,7 @@ krb5.conf: Makefile # 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 |