summaryrefslogtreecommitdiff
path: root/test/runtest
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2012-05-21 20:36:42 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2012-05-21 20:36:42 +0100
commit7d99e6a1f26e03dea6988a18bf950c428ff4b5aa (patch)
treeb02014e16e1d15bc6683e21829d7cb6516737239 /test/runtest
parent8dedb69a41c30fd82ab6e084fe567f7ee7aaa562 (diff)
Revert "Testsuite: more robust fix for SHELL vs /bin/sh"
This reverts commit 8dedb69a41c30fd82ab6e084fe567f7ee7aaa562. Kills testcase 0137.
Diffstat (limited to 'test/runtest')
-rwxr-xr-xtest/runtest8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/runtest b/test/runtest
index 83e1baf6f..3e961ca98 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/ ENV_SHELL/;
+ s/\s\Q$parm_shell\E\b/ 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";
}
-# Set a user's shell, distinguishable from /bin/sh
-symlink("/bin/sh","aux-var/sh");
-$ENV{'SHELL'} = $parm_shell = $parm_cwd . "aux-var/sh";
+# Find the user's shell
+
+$parm_shell = $ENV{'SHELL'};
##################################################