diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-11-04 18:39:35 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-11-04 18:39:35 +0000 |
| commit | bc47e3eeb7a046a80faf9ba9ea4ccedf111e33a7 (patch) | |
| tree | caa18248d5ad4f461f03aa30bd7e14df59b5756c /src/kadmin/testing/scripts | |
| parent | a234df421c16a369ef274b13d6cbe07145e6466a (diff) | |
| download | krb5-bc47e3eeb7a046a80faf9ba9ea4ccedf111e33a7.tar.gz krb5-bc47e3eeb7a046a80faf9ba9ea4ccedf111e33a7.tar.xz krb5-bc47e3eeb7a046a80faf9ba9ea4ccedf111e33a7.zip | |
Get rid of fake-install
Instead, use $(BUILDTOP)/plugins as the plugin base for tests. For
each real plugin module, create a link in the parent directory if
we're doing a shared-library build--so built KDB modules can be found
in plugins/kdb, preauth modules in plugins/preauth, etc..
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25436 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/testing/scripts')
| -rwxr-xr-x | src/kadmin/testing/scripts/env-setup.shin | 2 | ||||
| -rwxr-xr-x | src/kadmin/testing/scripts/init_db | 2 | ||||
| -rwxr-xr-x | src/kadmin/testing/scripts/start_servers | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin index 9511cec1d..bee5b5482 100755 --- a/src/kadmin/testing/scripts/env-setup.shin +++ b/src/kadmin/testing/scripts/env-setup.shin @@ -26,8 +26,6 @@ PROG_LIBPATH=-L@RBUILD@/lib BUILDTOP=@RBUILD@ # XXX kludge! PROG_RPATH=@RBUILD@/lib -# XXX more kludge! -FAKEDEST=@RBUILD@/util/fakedest # This converts $(TOPLIBD) to $TOPLIBD cat > /tmp/env_setup$$ <<\EOF @KRB5_RUN_ENV@ diff --git a/src/kadmin/testing/scripts/init_db b/src/kadmin/testing/scripts/init_db index 2ff820818..5cf749109 100755 --- a/src/kadmin/testing/scripts/init_db +++ b/src/kadmin/testing/scripts/init_db @@ -27,7 +27,7 @@ IROOT=$TOP/.. ADMIN=$TOP/dbutil BIN=$IROOT/bin ETC=$IROOT/etc -MODDIR=$TOP/../util/fakedest$libdir/krb5/plugins/kdb +MODDIR=$TOP/../plugins/kdb SBIN=$TOP/keytab:$TOP/server DUMMY=${REALM=SECURE-TEST.OV.COM}; export REALM diff --git a/src/kadmin/testing/scripts/start_servers b/src/kadmin/testing/scripts/start_servers index 80cf8d6f4..f32861884 100755 --- a/src/kadmin/testing/scripts/start_servers +++ b/src/kadmin/testing/scripts/start_servers @@ -39,7 +39,7 @@ if [ $local = 0 ]; then sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \ -e "s/__KDCHOST__/$hostname/g" \ -e "s/__LOCALHOST__/$localname/g" \ - -e "s#__MODDIR__#$TOP/../util/fakedest$libdir/db-modules#g"\ + -e "s#__MODDIR__#$TOP/../plugins/kdb#g"\ < $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf # Using /usr/ucb/rsh and getting rid of "-k $REALM" until we get |