From 21deb068f8adbd0a3f8727a898a0bd94c558031b Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 5 Sep 2023 21:46:17 +0100 Subject: [PATCH] Testsuite: unbreak use of explicit stderr on BSDs Broken-by: 09b9a4dfe0e5 --- test/Makefile.in | 1 + test/scripts/0000-Basic/0628 | 2 +- test/scripts/0000-Basic/0629 | 2 +- test/scripts/0000-Basic/0630 | 2 +- test/scripts/0000-Basic/0631 | 2 +- test/scripts/0000-Basic/0701 | 12 ++++++------ 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index dfa67bd38..c0013ba42 100644 --- 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 + 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: diff --git a/test/scripts/0000-Basic/0628 b/test/scripts/0000-Basic/0628 index 2397032fc..cb8cdd76d 100644 --- a/test/scripts/0000-Basic/0628 +++ b/test/scripts/0000-Basic/0628 @@ -66,6 +66,6 @@ killdaemon 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 diff --git a/test/scripts/0000-Basic/0629 b/test/scripts/0000-Basic/0629 index e99dbbe29..a4219d038 100644 --- a/test/scripts/0000-Basic/0629 +++ b/test/scripts/0000-Basic/0629 @@ -21,6 +21,6 @@ QUIT # killdaemon # -cp DIR/spool/log/serverdebuglog_rcpt /proc/self/fd/2 +cp DIR/spool/log/serverdebuglog_rcpt DIR/bin.sys/stderr # no_msglog_check diff --git a/test/scripts/0000-Basic/0630 b/test/scripts/0000-Basic/0630 index fd858773c..b5a7c1e8d 100644 --- a/test/scripts/0000-Basic/0630 +++ b/test/scripts/0000-Basic/0630 @@ -25,6 +25,6 @@ QUIT # killdaemon # -cp DIR/spool/log/serverdebuglog_router /proc/self/fd/2 +cp DIR/spool/log/serverdebuglog_router DIR/bin.sys/stderr # no_msglog_check diff --git a/test/scripts/0000-Basic/0631 b/test/scripts/0000-Basic/0631 index da67d5100..24c8efab9 100644 --- a/test/scripts/0000-Basic/0631 +++ b/test/scripts/0000-Basic/0631 @@ -25,6 +25,6 @@ QUIT # killdaemon # -cp DIR/spool/log/serverdebuglog_acl /proc/self/fd/2 +cp DIR/spool/log/serverdebuglog_acl DIR/bin.sys/stderr # no_msglog_check diff --git a/test/scripts/0000-Basic/0701 b/test/scripts/0000-Basic/0701 index 18921f68d..1c9ca9bf8 100644 --- 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 -255 TZ=GB +~0 TZ=GB 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 **** -255 TZ=GB +~0 TZ=GB 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 **** -255 TZ=GB +~0 TZ=GB 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 -- 2.30.2