diff options
Diffstat (limited to 'src/kadmin/testing/scripts')
| -rw-r--r-- | src/kadmin/testing/scripts/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/env-setup.sh | 7 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/env-setup.shin | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index 2d7fe41944..7896242a1f 100644 --- 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 461104d5dc..0713cddd47 100644 --- 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 461104d5dc..0713cddd47 100644 --- 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 |