Testsuite: unbreak use of explicit stderr on BSDs

Broken-by: 09b9a4dfe0e5

diff --git a/test/Makefile.in b/test/Makefile.in
index dfa67bd382a428fdbb4f5a37c6e1476328362025..c0013ba42cc845fd1f6656993285ab6c2f057387 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -29,6 +29,7 @@ binaries:     $(BINARIES)
 
 sysbinaries:   FORCE binaries
                bin/locate initdb postgres pg_ctl psql mysqld mysql
 
 sysbinaries:   FORCE binaries
                bin/locate initdb postgres pg_ctl psql mysqld mysql

+               test -e /dev/stderr || ln -s /proc/sys/fd/2 bin.sys/stderr && ln -s /dev/stderr bin.sys/stderr

                ls -la bin.sys
 
 # Compile and link the programs:
                ls -la bin.sys
 
 # Compile and link the programs:

diff --git a/test/scripts/0000-Basic/0628 b/test/scripts/0000-Basic/0628
index 2397032fc81b8cf9ce2d864342c4db670f8d62be..cb8cdd76d1d3b48156e2213b223266e8aa477781 100644 (file)
--- a/test/scripts/0000-Basic/0628
+++ b/test/scripts/0000-Basic/0628
@@ -66,6 +66,6 @@ killdaemon
 1
 cat DIR/spool/log/serverdebuglog_1
 #
 1
 cat DIR/spool/log/serverdebuglog_1
 #

-cp DIR/spool/log/serverdebuglog_2 /proc/self/fd/2
+cp DIR/spool/log/serverdebuglog_2 DIR/bin.sys/stderr

 #
 no_msglog_check
 #
 no_msglog_check

diff --git a/test/scripts/0000-Basic/0629 b/test/scripts/0000-Basic/0629
index e99dbbe291abfd763d1f1ff873489d8381e5e851..a4219d03834edd2e35505fd7d1773b6ab51ab96c 100644 (file)
--- a/test/scripts/0000-Basic/0629
+++ b/test/scripts/0000-Basic/0629
@@ -21,6 +21,6 @@ QUIT
 #
 killdaemon
 #
 #
 killdaemon
 #

-cp DIR/spool/log/serverdebuglog_rcpt /proc/self/fd/2
+cp DIR/spool/log/serverdebuglog_rcpt DIR/bin.sys/stderr

 #
 no_msglog_check
 #
 no_msglog_check

diff --git a/test/scripts/0000-Basic/0630 b/test/scripts/0000-Basic/0630
index fd858773c3ea4440098499246cfea2b80c7cb197..b5a7c1e8dc94a50752be457ca495cb8bfd578e75 100644 (file)
--- a/test/scripts/0000-Basic/0630
+++ b/test/scripts/0000-Basic/0630
@@ -25,6 +25,6 @@ QUIT
 #
 killdaemon
 #
 #
 killdaemon
 #

-cp DIR/spool/log/serverdebuglog_router /proc/self/fd/2
+cp DIR/spool/log/serverdebuglog_router DIR/bin.sys/stderr

 #
 no_msglog_check
 #
 no_msglog_check

diff --git a/test/scripts/0000-Basic/0631 b/test/scripts/0000-Basic/0631
index da67d51009206d603e79b47d084a9f211eb0cd5d..24c8efab99c949d58f4196f0b8125f16928a1e13 100644 (file)
--- a/test/scripts/0000-Basic/0631
+++ b/test/scripts/0000-Basic/0631
@@ -25,6 +25,6 @@ QUIT
 #
 killdaemon
 #
 #
 killdaemon
 #

-cp DIR/spool/log/serverdebuglog_acl /proc/self/fd/2
+cp DIR/spool/log/serverdebuglog_acl DIR/bin.sys/stderr

 #
 no_msglog_check
 #
 no_msglog_check

diff --git a/test/scripts/0000-Basic/0701 b/test/scripts/0000-Basic/0701
index 18921f68d8db3a18558cc0cf75a7412ce9007f96..1c9ca9bf8ec4de24a549d0ffe42dd622f350c15b 100644 (file)
--- a/test/scripts/0000-Basic/0701
+++ b/test/scripts/0000-Basic/0701
@@ -48,26 +48,26 @@ exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 zzzzzz
 exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  localhost_number = 20
 exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  localhost_number = 20

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z -localhost_number=20 E000000-005XGK-00
 ****
 exim_msgdate -l -u -z -localhost_number=20 E000000-005XGK-00
 ****

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z -localhost_number=20 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
 ****
 exim_msgdate -l -u -z -localhost_number=20 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
 ****

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 zzzzzz
 ****
 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 zzzzzz
 ****

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  base=36
 0 TZ=GB
 exim_msgdate -l -u -z --b36 E000000-005XGK-00
 ****
 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 ZZZZZZ
 ****
 ### All msg-id types, all zones,  base=36
 0 TZ=GB
 exim_msgdate -l -u -z --b36 E000000-005XGK-00
 ****

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z --b36 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
 ****
 exim_msgdate -l -u -z --b36 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
 ****

-255 TZ=GB
+~0 TZ=GB

 exim_msgdate -l -u -z --b36 000000 1PANS3 zzzzzz
 ****
 0 TZ=GB
 exim_msgdate -l -u -z --b36 000000 1PANS3 zzzzzz
 ****
 0 TZ=GB