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/config | |
| 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/config')
| -rw-r--r-- | src/config/post.in | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/config/post.in b/src/config/post.in index c4cdcae3b..861117c9e 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -136,10 +136,10 @@ check-unix:: check-pytests check-pytests:: check-pytests-@HAVE_PYTHON@ -check-pytests-yes: runenv.py +check-pytests-yes: @pytests="$(PYTESTS)"; \ for t in $$pytests; do \ - echo PYTHONPATH=`pwd`:$(top_srcdir)/util VALGRIND="$(VALGRIND)" \ + echo PYTHONPATH=$(BUILDTOP):$(top_srcdir)/util VALGRIND="$(VALGRIND)" \ $(PYTHON) $(srcdir)/$$t $(PYTESTFLAGS); \ PYTHONPATH=`pwd`:$(top_srcdir)/util VALGRIND="$(VALGRIND)" \ $(PYTHON) $(srcdir)/$$t $(PYTESTFLAGS) || exit 1; \ @@ -150,22 +150,11 @@ check-pytests-no: echo "+++ Skipping because Python not available: $(PYTESTS)"; \ fi -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:: clean-$(WHAT) clean-unix:: $(RM) $(OBJS) $(DEPTARGETS_CLEAN) $(EXTRA_FILES) et-[ch]-*.et et-[ch]-*.[ch] -$(RM) -r $(top_srcdir)/autom4te.cache - $(RM) runenv.py pyrunenv.vals clean-windows:: $(RM) *.$(OBJEXT) |