diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2012-05-21 19:51:21 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2012-05-21 19:51:21 +0100 |
| commit | 8dedb69a41c30fd82ab6e084fe567f7ee7aaa562 (patch) | |
| tree | b78090d33973c8b2c92c8d28455831b4ad88733b | |
| parent | c2fb33b4cd2a3f10d5a583b0260827457f976dac (diff) | |
| download | exim4-8dedb69a41c30fd82ab6e084fe567f7ee7aaa562.tar.gz | |
Testsuite: more robust fix for SHELL vs /bin/sh
| -rw-r--r-- | test/log/0369 | 8 | ||||
| -rwxr-xr-x | test/runtest | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/log/0369 b/test/log/0369 index 160da5f7b..174ea1a84 100644 --- a/test/log/0369 +++ b/test/log/0369 @@ -1,11 +1,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => 0 <0@test.ex> R=r1 T=t1 -1999-03-02 09:44:33 10HmaX-0005vi-00 ** 10@test.ex R=r1 T=t1: Child process of t1 transport returned 10 from command: SHELL -1999-03-02 09:44:33 10HmaX-0005vi-00 == 45@test.ex R=r1 T=t1 defer (0): Child process of t1 transport returned 45 from command: SHELL +1999-03-02 09:44:33 10HmaX-0005vi-00 ** 10@test.ex 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@test.ex R=r1 T=t1 defer (0): Child process of t1 transport returned 45 from command: /bin/sh 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@myhost.test.ex: 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@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 => 0 <0@test2.ex> R=r2 T=t2 -1999-03-02 09:44:33 10HmaZ-0005vi-00 == 10@test2.ex 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@test2.ex R=r2 T=t2 defer (0): Child process of t2 transport returned 45 from command: SHELL +1999-03-02 09:44:33 10HmaZ-0005vi-00 == 10@test2.ex 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@test2.ex R=r2 T=t2 defer (0): Child process of t2 transport returned 45 from command: /bin/sh 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"; ################################################## |