diff options
author | Greg Hudson <ghudson@mit.edu> | 2011-11-04 17:15:37 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2011-11-04 17:15:37 +0000 |
commit | a234df421c16a369ef274b13d6cbe07145e6466a (patch) | |
tree | d2bc1f8ff7a137ec128dc67e93a71823cc6e80a2 | |
parent | 69d537b84f626eb2e55c5c193db5bc2afcb2be91 (diff) | |
download | krb5-a234df421c16a369ef274b13d6cbe07145e6466a.tar.gz krb5-a234df421c16a369ef274b13d6cbe07145e6466a.tar.xz krb5-a234df421c16a369ef274b13d6cbe07145e6466a.zip |
Add cross-realm support to "make testrealm"
Allow "make testrealm CROSSNUM=N" to make N fully-connected realms for
cross-realm testing convenience.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25435 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r-- | src/Makefile.in | 5 | ||||
-rw-r--r-- | src/util/testrealm.py | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 7ac83206e..acd27baf0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -592,8 +592,11 @@ check-unix:: krb5-config check-prerecurse: fake-install # Create a test realm and spawn a shell in an environment pointing to it. +# If CROSSNUM is set, create that many fully connected test realms and +# point the shell at the first one. testrealm: fake-install - PYTHONPATH=$(BUILDTOP):$(top_srcdir)/util $(PYTHON) $(srcdir)/util/testrealm.py + PYTHONPATH=$(top_srcdir)/util $(PYTHON) $(srcdir)/util/testrealm.py \ + $(CROSSNUM) # environment variable settings to propagate to Python-based tests diff --git a/src/util/testrealm.py b/src/util/testrealm.py index 30b3256ed..53f062250 100644 --- a/src/util/testrealm.py +++ b/src/util/testrealm.py @@ -22,7 +22,9 @@ # Invoked by the testrealm target in the top-level Makefile. Creates # a test realm and spawns a shell pointing at it, for convenience of -# manual testing. +# manual testing. If a numeric argument is present after options, +# creates that many fully connected test realms and point the shell at +# the first one. from k5test import * @@ -53,7 +55,11 @@ def supplement_path(env): # Assume PATH exists in env for simplicity. env['PATH'] = path_prefix + env['PATH'] -realm = K5Realm() +if args: + realms = cross_realms(int(args[0])) + realm = realms[0] +else: + realm = K5Realm() env = realm.env_master.copy() supplement_path(env) |