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.shin | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index 9f4cfa803..c7ea6114b 100644 --- a/src/kadmin/testing/scripts/ChangeLog +++ b/src/kadmin/testing/scripts/ChangeLog @@ -1,3 +1,8 @@ +2000-06-27 Ezra Peisach <epeisach@mit.edu> + + * env-setup.shin: Do not override the EXPECT environment variable + if set. + 1998-11-13 Theodore Ts'o <tytso@rsts-11.mit.edu> * 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 6e0abe80e..17c818dca 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 |