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

3 files changed, 3 insertions, 8 deletions

diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index ffdfbd6175..6794a91d6e 100644
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -40,7 +40,5 @@ runenv.vals: Makefile
 site.exp: runenv.vals Makefile
 	echo "set runvarlist [list `cat runenv.vals | tr '\n' ' '`]" | \
 		sed -e 's%=\.%='`pwd`'/.%g' > site.exp
-	echo "set KRB5_DB_MODULE_DIR {$(KRB5_DB_MODULE_DIR)}" >> site.exp
-	echo "set MODULE_DIR {$(MODULE_DIR)}" >> site.exp
 	echo "set PRIOCNTL_HACK @PRIOCNTL_HACK@" >> site.exp
 
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 796ea3716f..8ab4b7902d 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -911,8 +911,6 @@ proc setup_krb5_conf { {type client} } {
     global allow_weak_crypto
     global mode
     global portbase
-    global KRB5_DB_MODULE_DIR
-    global MODULE_DIR
     global srcdir
 
     set pkinit_certs [findfile "[pwd]/$srcdir/pkinit-certs" "[pwd]/$srcdir/pkinit-certs" "$srcdir/pkinit-certs"]
@@ -944,7 +942,7 @@ proc setup_krb5_conf { {type client} } {
 	if { $mode == "tcp" } {
 	    puts $conffile "	udp_preference_limit = 1"
 	}
-	puts $conffile "	plugin_base_dir = $tmppwd/../../../util/fakedest$MODULE_DIR"
+	puts $conffile "	plugin_base_dir = $tmppwd/../../../plugins"
 	puts $conffile ""
 	puts $conffile "\[realms\]"
 	puts $conffile "	$REALMNAME = \{"
@@ -973,7 +971,7 @@ proc setup_krb5_conf { {type client} } {
 	puts $conffile "	default = FILE:$tmppwd/others.log"
 	puts $conffile ""
 	puts $conffile "\[dbmodules\]"
-	puts $conffile "	db_module_dir = $tmppwd/../../../util/fakedest$KRB5_DB_MODULE_DIR"
+	puts $conffile "	db_module_dir = $tmppwd/../../../plugins/kdb"
 	puts $conffile "	foo_db2 = {"
 	puts $conffile "		db_library = db2"
 	puts $conffile "		database_name = $tmppwd/$type-db"
diff --git a/src/tests/dejagnu/krb-standalone/standalone.exp b/src/tests/dejagnu/krb-standalone/standalone.exp
index 03a5d52e08..5b5970fbae 100644
--- a/src/tests/dejagnu/krb-standalone/standalone.exp
+++ b/src/tests/dejagnu/krb-standalone/standalone.exp
@@ -139,7 +139,6 @@ proc doit { } {
     global portbase
     global mode
     global tmppwd
-    global MODULE_DIR
 
     setup_kerberos_env kdc
 
@@ -235,7 +234,7 @@ proc doit { } {
     }
 
     # If we have anonymous  then test it
-    if [file exists "$tmppwd/../../../util/fakedest$MODULE_DIR/preauth/pkinit.so" ] {
+    if [file exists "$tmppwd/../../../plugins/preauth/pkinit.so" ] {
 	kinit_anonymous "WELLKNOWN/ANONYMOUS"
     }