diff options
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Makefile.in | 3 | ||||
| -rw-r--r-- | src/util/k5test.py | 16 |
2 files changed, 3 insertions, 16 deletions
diff --git a/src/util/Makefile.in b/src/util/Makefile.in index c791c0626..f45bc7082 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -19,9 +19,6 @@ MAYBE_VERTO_k5 = verto k5ev all-recurse: -clean-unix:: - $(RM) -r $(FAKEPREFIX) - NO_OUTDIR=1 install:: diff --git a/src/util/k5test.py b/src/util/k5test.py index 503085a31..09a66a90a 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -86,7 +86,7 @@ keyword arguments: - $testdir: The realm storage directory (absolute path) - $buildtop: The root of the build directory - $srctop: The root of the source directory - - $plugins: The plugin directory under $buildtop/util/fakedest + - $plugins: The plugin directory in the build tree - $hostname: The FQDN of the host - $port0: The first listener port (portbase) - ... @@ -171,7 +171,7 @@ Scripts may use the following functions and variables: * srctop: The top of the source directory (absolute path). -* plugins: The plugin directory under <buildtop>/util/fakedest. +* plugins: The plugin directory in the build tree (absolute path). * hostname: This machine's fully-qualified domain name. @@ -418,16 +418,6 @@ def _find_srctop(): return os.path.abspath(root) -def _find_plugins(): - global buildtop - fakeroot = os.path.join(buildtop, 'util', 'fakedest') - if not os.path.exists(fakeroot): - fail('You must run "make fake-install" in %s first.' % buildtop) - for dir, subdirs, files in os.walk(fakeroot): - if os.path.basename(dir) == 'plugins' and 'kdb' in subdirs: - return dir - fail('Cannot locate plugins; run "make fake-install" at %s.' % buildtop) - # Return the local hostname as it will be canonicalized by # krb5_sname_to_principal. We can't simply use socket.getfqdn() # because it explicitly prefers results containing periods and @@ -1145,7 +1135,7 @@ _outfile = open('testlog', 'w') _cmd_index = 1 buildtop = _find_buildtop() srctop = _find_srctop() -plugins = _find_plugins() +plugins = os.path.join(buildtop, 'plugins') _runenv = _import_runenv() hostname = _get_hostname() null_input = open(os.devnull, 'r') |