* env-setup.sh: set K5ROOT to $TESTDIR/krb5-test-root by default,

 	but use an absolute path

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9128 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 2d7fe41944dfb746afbb016a9157fb33ec05e509..7896242a1f4c1e85412a308eef87909d0df464bb 100644 (file)
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 27 14:12:59 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+       * env-setup.sh: set K5ROOT to $TESTDIR/krb5-test-root by default,
+       but use an absolute path
+
 Thu Sep 26 17:48:32 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * env-setup.sh, init_db, start_servers_local: use K5ROOT instead

diff --git a/src/kadmin/testing/scripts/env-setup.sh b/src/kadmin/testing/scripts/env-setup.sh
index 461104d5dc9a7ebf1dc84e4227698d8e378b665b..0713cddd47e63fc9a9204974ff2d53e818ef161a 100644 (file)
--- a/src/kadmin/testing/scripts/env-setup.sh
+++ b/src/kadmin/testing/scripts/env-setup.sh
@@ -16,12 +16,11 @@ if [ "$TOP" = "" ]; then
        exit 1
 fi
 
+TESTDIR=$TOP/testing; export TESTDIR
 if [ "$K5ROOT" = "" ]; then
-       # XXX this should default to --prefix, no?
-       K5ROOT="/krb5"; export K5ROOT
+       K5ROOT="`cd $TESTDIR; pwd`/krb5-test-root"
+       export K5ROOT
 fi
-
-TESTDIR=$TOP/testing; export TESTDIR
 COMPARE_DUMP=$TESTDIR/scripts/compare_dump.pl; export COMPARE_DUMP
 FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl
 export FIX_CONF_FILES

diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index 461104d5dc9a7ebf1dc84e4227698d8e378b665b..0713cddd47e63fc9a9204974ff2d53e818ef161a 100644 (file)
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -16,12 +16,11 @@ if [ "$TOP" = "" ]; then
        exit 1
 fi
 
+TESTDIR=$TOP/testing; export TESTDIR
 if [ "$K5ROOT" = "" ]; then
-       # XXX this should default to --prefix, no?
-       K5ROOT="/krb5"; export K5ROOT
+       K5ROOT="`cd $TESTDIR; pwd`/krb5-test-root"
+       export K5ROOT
 fi
-
-TESTDIR=$TOP/testing; export TESTDIR
 COMPARE_DUMP=$TESTDIR/scripts/compare_dump.pl; export COMPARE_DUMP
 FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl
 export FIX_CONF_FILES