diff options
| author | Tom Yu <tlyu@mit.edu> | 2010-04-20 22:35:42 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2010-04-20 22:35:42 +0000 |
| commit | 496aa945b271b670628a5c69df591f5768d5987f (patch) | |
| tree | ccc050eb35e669af95e580797c82a3d0d244bad8 /src/Makefile.in | |
| parent | 04392a812b84527dcf7d4cebfa91ab9c69d7cc40 (diff) | |
| download | krb5-496aa945b271b670628a5c69df591f5768d5987f.tar.gz krb5-496aa945b271b670628a5c69df591f5768d5987f.tar.xz krb5-496aa945b271b670628a5c69df591f5768d5987f.zip | |
Only create runenv.py at BUILDTOP. Fix bugs in k5test.py relating to
environment initialization, also so that "make testrealm" works again.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23913 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ed0e69c142..2f64c497ba 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -14,8 +14,10 @@ SUBDIRS=util include lib \ plugins/preauth/encrypted_challenge \ kdc kadmin slave clients appl tests \ config-files gen-manpages -BUILDTOP=$(REL)$(C) +BUILDTOP=$(REL). LOCALINCLUDES = -I$(srcdir) +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) SRCS = HDRS = @@ -625,8 +627,25 @@ check-unix:: krb5-config check-prerecurse: fake-install # Create a test realm and spawn a shell in an environment pointing to it. -testrealm: fake-install - PYTHONPATH=$(top_srcdir)/util $(PYTHON) $(srcdir)/util/testrealm.py +testrealm: fake-install runenv.py + PYTHONPATH=$(BUILDTOP):$(top_srcdir)/util $(PYTHON) $(srcdir)/util/testrealm.py + +# environment variable settings to propagate to Python-based tests + +check-pytests-yes: runenv.py + +pyrunenv.vals: Makefile + $(KRB5_RUN_ENV) \ + for i in $(KRB5_RUN_VARS); do \ + eval echo 'env['\\\'$$i\\\''] = '\\\'\$$$$i\\\'; \ + done > $@ + +runenv.py: pyrunenv.vals + echo 'env = {}' > $@ + cat pyrunenv.vals >> $@ + +clean-unix:: + $(RM) runenv.py pyrunenv.vals COV_BUILD= cov-build COV_ANALYZE= cov-analyze |