* 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

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 9f4cfa8030eaca87e22a7e6eef6f5950b13968c4..c7ea6114ba53ee6461c42ddecd4456646bb93949 100644 (file)
--- 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 6e0abe80e4a71124dd8e81c57b25e8b58a10cc51..17c818dca695328ec1bc066c83b101590cafb6ac 100644 (file)
--- 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