From 8dedb69a41c30fd82ab6e084fe567f7ee7aaa562 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 21 May 2012 19:51:21 +0100
Subject: Testsuite: more robust fix for SHELL vs /bin/sh

---
 test/runtest | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/runtest')

diff --git a/test/runtest b/test/runtest
index 3e961ca98..83e1baf6f 100755
--- a/test/runtest
+++ b/test/runtest
@@ -392,7 +392,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/:[^:]+: while opening named pipe/: Error: while opening named pipe/;
 
   # The name of the shell may vary
-  s/\s\Q$parm_shell\E\b/ SHELL/;
+  s/\s\Q$parm_shell\E\b/ ENV_SHELL/;
 
   # Debugging output of lists of hosts may have different sort keys
   s/sort=\S+/sort=xx/ if /^\S+ (?:\d+\.){3}\d+ mx=\S+ sort=\S+/;
@@ -2728,9 +2728,9 @@ if ($parm_hostname =~ /[[:upper:]]/)
   print "\n*** Host name has upper case characters: this may cause problems ***\n\n";
   }
 
-# Find the user's shell
-
-$parm_shell = $ENV{'SHELL'};
+# Set a user's shell, distinguishable from /bin/sh
+symlink("/bin/sh","aux-var/sh");
+$ENV{'SHELL'} = $parm_shell = $parm_cwd . "aux-var/sh";
 
 
 ##################################################
-- 
cgit v1.2.3