[exim-cvs] Revert "Testsuite: more robust fix for SHELL vs /…

Gitweb: http://git.exim.org/exim.git/commitdiff/7d99e6a1f26e03dea6988a18bf950c428ff4b5aa

Commit:     7d99e6a1f26e03dea6988a18bf950c428ff4b5aa
Parent:     8dedb69a41c30fd82ab6e084fe567f7ee7aaa562
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon May 21 20:36:42 2012 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon May 21 20:36:42 2012 +0100

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

    This reverts commit 8dedb69a41c30fd82ab6e084fe567f7ee7aaa562.
    Kills testcase 0137.
---
 test/log/0369 |    8 ++++----
 test/runtest  |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/log/0369 b/test/log/0369
index 174ea1a..160da5f 100644
--- a/test/log/0369
+++ b/test/log/0369
@@ -1,11 +1,11 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 => 0 <0@???> R=r1 T=t1
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** 10@??? R=r1 T=t1: Child process of t1 transport returned 10 from command: /bin/sh
-1999-03-02 09:44:33 10HmaX-0005vi-00 == 45@??? R=r1 T=t1 defer (0): Child process of t1 transport returned 45 from command: /bin/sh
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** 10@??? R=r1 T=t1: Child process of t1 transport returned 10 from command: SHELL
+1999-03-02 09:44:33 10HmaX-0005vi-00 == 45@??? R=r1 T=t1 defer (0): Child process of t1 transport returned 45 from command: SHELL
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@???: I can't route to CALLER
1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message)
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 => 0 <0@???> R=r2 T=t2
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == 10@??? R=r2 T=t2 defer (0): Child process of t2 transport returned 10 from command: /bin/sh
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == 45@??? R=r2 T=t2 defer (0): Child process of t2 transport returned 45 from command: /bin/sh
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == 10@??? R=r2 T=t2 defer (0): Child process of t2 transport returned 10 from command: SHELL
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == 45@??? R=r2 T=t2 defer (0): Child process of t2 transport returned 45 from command: SHELL
diff --git a/test/runtest b/test/runtest
index 83e1baf..3e961ca 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'};


##################################################