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/util | |
| parent | 04392a812b84527dcf7d4cebfa91ab9c69d7cc40 (diff) | |
| download | krb5-496aa945b271b670628a5c69df591f5768d5987f.zip krb5-496aa945b271b670628a5c69df591f5768d5987f.tar.gz krb5-496aa945b271b670628a5c69df591f5768d5987f.tar.bz2 | |
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/util')
| -rw-r--r-- | src/util/k5test.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/util/k5test.py b/src/util/k5test.py index 1065191..f90f8ac 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -467,7 +467,14 @@ def _match_cmdnum(cmdnum, ind): # Return an environment suitable for running programs in the build # tree. It is safe to modify the result. def _build_env(): - return dict(runenv.env) + global buildtop + env = os.environ.copy() + for (k, v) in runenv.env.iteritems(): + if v.find('./') == 0: + env[k] = os.path.join(buildtop, v) + else: + env[k] = v + return env # Merge the nested dictionaries cfg1 and cfg2 into a new dictionary. # cfg1 or cfg2 may be None, in which case the other is returned. If |