diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-07-03 03:18:30 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-07-03 03:18:30 +0000 |
| commit | 56d2e2607925289235c542cb72aa32b3b4ec12ca (patch) | |
| tree | 7697494a2817a4a9cbf0857a1be96c5b31cf0716 /src/kadmin/testing | |
| parent | b6a42e596c12485ed6c34f1934f91084dbc5c2cf (diff) | |
| download | krb5-56d2e2607925289235c542cb72aa32b3b4ec12ca.zip krb5-56d2e2607925289235c542cb72aa32b3b4ec12ca.tar.gz krb5-56d2e2607925289235c542cb72aa32b3b4ec12ca.tar.bz2 | |
* 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
Diffstat (limited to 'src/kadmin/testing')
| -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 9f4cfa8..c7ea611 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 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 |