Testsuite: more robust fix for SHELL vs /bin/sh

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 3e961ca9857e0e25dc28a9effce54fc39221b633..83e1baf6f0e30376c84cb6f09882cc5a55982ccc 100755 (executable)
--- 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";
 
 
 ##################################################