From 56d2e2607925289235c542cb72aa32b3b4ec12ca Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Mon, 3 Jul 2000 03:18:30 +0000 Subject: * env-setup.shin: Do not override the EXPECT environment variable if set. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12511 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/testing/scripts/ChangeLog | 5 +++++ src/kadmin/testing/scripts/env-setup.shin | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/kadmin/testing') diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index 9f4cfa8..c7ea611 100644 --- a/src/kadmin/testing/scripts/ChangeLog +++ b/src/kadmin/testing/scripts/ChangeLog @@ -1,3 +1,8 @@ +2000-06-27 Ezra Peisach + + * env-setup.shin: Do not override the EXPECT environment variable + if set. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin index 6e0abe8..17c818d 100644 --- a/src/kadmin/testing/scripts/env-setup.shin +++ b/src/kadmin/testing/scripts/env-setup.shin @@ -54,7 +54,9 @@ export VERBOSE REALM=SECURE-TEST.OV.COM; export REALM -EXPECT=@EXPECT@; export EXPECT +if test x$EXPECT = x; then + EXPECT=@EXPECT@; export EXPECT +fi COMPARE_DUMP=$TESTDIR/scripts/compare_dump.pl; export COMPARE_DUMP FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl -- cgit v1.1