2 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d8c0719a..08054bba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
 20040616
  - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
    code changes.
- - (dtucker) [regress/test-exec.sh]
-   Move Portable-only StrictModes to top of list to make syncs easier.
  - (dtucker) OpenBSD CVS Sync regress/
    - djm@cvs.openbsd.org 2004/04/27 09:47:30
      [regress/Makefile regress/test-exec.sh, added regress/envpass.sh]
@@ -18,6 +16,10 @@
    - djm@cvs.openbsd.org 2004/06/13 15:16:54
      [regress/test-exec.sh]
      remove duplicate setting of $SCP; spotted by markus@
+ - (dtucker) [regress/test-exec.sh]
+   Move Portable-only StrictModes to top of list to make syncs easier.
+ - (dtucker) [regress/README.regress]
+   Add $TEST_SHELL to readme.
 
 20040615
  - (djm) OpenBSD CVS Sync
@@ -1243,4 +1245,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3394 2004/06/16 10:36:16 dtucker Exp $
+$Id: ChangeLog,v 1.3395 2004/06/16 11:08:32 dtucker Exp $
diff --git a/regress/README.regress b/regress/README.regress
index 6ff032b68..81c2fbe5d 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -27,6 +27,7 @@ TEST_SSH_QUIET: set to "yes" to suppress non-fatal output.
 TEST_SSH_x: path to "ssh" command under test, where x=SSH,SSHD,SSHAGENT,SSHADD
         SSHKEYGEN,SSHKEYSCAN,SFTP,SFTPSERVER
 OBJ: used by test scripts to access build dir.
+TEST_SHELL: shell used for running the test scripts.
 
 
 Individual tests.
@@ -35,7 +36,8 @@ You can invoke test-exec.sh directly if you set up the path to find the
 binaries under test and the test scripts themselves, for example:
 
 $ cd regress
-$ PATH=`pwd`/..:$PATH:. sh test-exec.sh `pwd` agent-timeout.sh
+$ PATH=`pwd`/..:$PATH:. TEST_SHELL=/bin/sh sh test-exec.sh `pwd` \
+    agent-timeout.sh
 ok agent timeout test
 
 
@@ -94,4 +96,4 @@ Known Issues.
   unless ssh-rand-helper is in pre-installed (the path to
   ssh-rand-helper is hard coded).
 
-$Id: README.regress,v 1.4 2004/03/08 20:12:18 tim Exp $
+$Id: README.regress,v 1.5 2004/06/16 11:08:32 dtucker Exp $