summaryrefslogtreecommitdiffstats
path: root/src/kadmin/testing/scripts/env-setup.shin
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2000-07-03 03:18:30 +0000
committerEzra Peisach <epeisach@mit.edu>2000-07-03 03:18:30 +0000
commit56d2e2607925289235c542cb72aa32b3b4ec12ca (patch)
tree7697494a2817a4a9cbf0857a1be96c5b31cf0716 /src/kadmin/testing/scripts/env-setup.shin
parentb6a42e596c12485ed6c34f1934f91084dbc5c2cf (diff)
downloadkrb5-56d2e2607925289235c542cb72aa32b3b4ec12ca.tar.gz
krb5-56d2e2607925289235c542cb72aa32b3b4ec12ca.tar.xz
krb5-56d2e2607925289235c542cb72aa32b3b4ec12ca.zip
* 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/scripts/env-setup.shin')
-rw-r--r--src/kadmin/testing/scripts/env-setup.shin4
1 files changed, 3 insertions, 1 deletions
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