diff options
Diffstat (limited to 'app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch')
| -rw-r--r-- | app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch | 482 |
1 files changed, 0 insertions, 482 deletions
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch deleted file mode 100644 index e1f6a3234d06..000000000000 --- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-issue963.patch +++ /dev/null @@ -1,482 +0,0 @@ -From b81d6dd36545f79c46e0a3488a9b26d0db75646a Mon Sep 17 00:00:00 2001 -From: Thomas D. -Date: Tue, 19 Apr 2016 02:09:18 +0200 -Subject: [PATCH 2/2] testbench: Use LD_PRELOAD=libfaketime.so instead of - faketime binary - -Fixes: https://github.com/rsyslog/rsyslog/issues/963 ---- - tests/faketime_common.sh | 20 +++++++------------- - tests/now-utc-casecmp.sh | 2 +- - tests/now-utc-ymd.sh | 2 +- - tests/now-utc.sh | 2 +- - tests/now_family_utc.sh | 2 +- - tests/timegenerated-dateordinal-invld.sh | 8 ++++---- - tests/timegenerated-dateordinal.sh | 28 ++++++++++++++-------------- - tests/timegenerated-utc-legacy.sh | 2 +- - tests/timegenerated-utc.sh | 2 +- - tests/timegenerated-uxtimestamp-invld.sh | 8 ++++---- - tests/timegenerated-uxtimestamp.sh | 26 ++++++++++++-------------- - tests/timegenerated-ymd.sh | 2 +- - 12 files changed, 48 insertions(+), 56 deletions(-) - -diff --git a/tests/faketime_common.sh b/tests/faketime_common.sh -index 10e0128..432ade6 100644 ---- a/tests/faketime_common.sh -+++ b/tests/faketime_common.sh -@@ -4,26 +4,20 @@ - # faketime is missing or the system isn't year-2038 complaint. - # This script can be sourced to prevent duplicated code. - --if ! hash faketime 2>/dev/null ; then -- echo "faketime command missing, skipping test" -+faketime_testtime=$(LD_PRELOAD=libfaketime.so FAKETIME="1991-08-25 20:57:08" TZ=GMT date +%s 2>/dev/null) -+if [ ${faketime_testtime} -ne 683153828 ] ; then -+ echo "libfaketime.so missing, skipping test" - exit 77 - fi - --export TZ=UTC+01:00 -- --faketime -f '2016-03-11 16:00:00' date 1>/dev/null 2>&1 --if [ $? -ne 0 ]; then -- # Safe-guard -- should never happen! -- echo "faketime command not working as expected. Check faketime binary in path!" -- exit 1 --fi -- --faketime '2040-01-01 16:00:00' date 1>/dev/null 2>&1 --if [ $? -ne 0 ]; then -+# GMT-1 (POSIX TIME) is GMT+1 in "Human Time" -+faketime_testtime=$(LD_PRELOAD=libfaketime.so FAKETIME="2040-01-01 16:00:00" TZ=GMT-1 date +%s 2>/dev/null) -+if [ ${faketime_testtime} -eq -1 ]; then - # System isn't year-2038 compatible - RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE="yes" - fi - -+export LD_PRELOAD=libfaketime.so - - rsyslog_testbench_require_y2k38_support() { - if [ -n "${RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE}" ]; then -diff --git a/tests/now-utc-casecmp.sh b/tests/now-utc-casecmp.sh -index 8f8d6a0..26bb7ee 100755 ---- a/tests/now-utc-casecmp.sh -+++ b/tests/now-utc-casecmp.sh -@@ -19,7 +19,7 @@ template(name="outfmt" type="string" - :msg, contains, "msgnum:" action(type="omfile" template="outfmt" - file="rsyslog.out.log") - ' --faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup - # what we send actually is irrelevant, as we just use system properties. - # but we need to send one message in order to gain output! - . $srcdir/diag.sh tcpflood -m1 -diff --git a/tests/now-utc-ymd.sh b/tests/now-utc-ymd.sh -index c327983..6e2d183 100755 ---- a/tests/now-utc-ymd.sh -+++ b/tests/now-utc-ymd.sh -@@ -19,7 +19,7 @@ template(name="outfmt" type="string" - :msg, contains, "msgnum:" action(type="omfile" template="outfmt" - file="rsyslog.out.log") - ' --faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup - # what we send actually is irrelevant, as we just use system properties. - # but we need to send one message in order to gain output! - . $srcdir/diag.sh tcpflood -m1 -diff --git a/tests/now-utc.sh b/tests/now-utc.sh -index ed83948..69fd4fd 100755 ---- a/tests/now-utc.sh -+++ b/tests/now-utc.sh -@@ -9,7 +9,7 @@ echo \[now-utc\]: test \$NOW-UTC - export TZ=TEST-02:00 - - . $srcdir/diag.sh init --faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup now-utc.conf -+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup now-utc.conf - # what we send actually is irrelevant, as we just use system properties. - # but we need to send one message in order to gain output! - . $srcdir/diag.sh tcpflood -m1 -diff --git a/tests/now_family_utc.sh b/tests/now_family_utc.sh -index caba0f9..e791cbf 100755 ---- a/tests/now_family_utc.sh -+++ b/tests/now_family_utc.sh -@@ -9,7 +9,7 @@ echo \[now_family_utc\]: test \$NOW family of system properties - export TZ=TEST+06:30 - - . $srcdir/diag.sh init --faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup now_family_utc.conf -+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup now_family_utc.conf - # what we send actually is irrelevant, as we just use system properties. - # but we need to send one message in order to gain output! - . $srcdir/diag.sh tcpflood -m1 -diff --git a/tests/timegenerated-dateordinal-invld.sh b/tests/timegenerated-dateordinal-invld.sh -index bac5d4e..dc5e14c 100755 ---- a/tests/timegenerated-dateordinal-invld.sh -+++ b/tests/timegenerated-dateordinal-invld.sh -@@ -25,7 +25,7 @@ template(name="outfmt" type="string" - - echo "***SUBTEST: check 1800-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '1800-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='1800-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -40,7 +40,7 @@ fi; - - echo "***SUBTEST: check 1960-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '1960-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='1960-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -55,7 +55,7 @@ fi; - - echo "***SUBTEST: check 2101-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2101-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='2101-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -70,7 +70,7 @@ fi; - - echo "***SUBTEST: check 2500-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2500-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='2500-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -diff --git a/tests/timegenerated-dateordinal.sh b/tests/timegenerated-dateordinal.sh -index ace1c16..1164e53 100755 ---- a/tests/timegenerated-dateordinal.sh -+++ b/tests/timegenerated-dateordinal.sh -@@ -25,7 +25,7 @@ template(name="outfmt" type="string" - - echo "***SUBTEST: check 1970-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '1970-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='1970-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -39,7 +39,7 @@ fi; - - echo "***SUBTEST: check 2000-03-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2000-03-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2000-03-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -53,7 +53,7 @@ fi; - - echo "***SUBTEST: check 2016-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -67,7 +67,7 @@ fi; - - echo "***SUBTEST: check 2016-02-29" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-02-29 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-02-29 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -81,7 +81,7 @@ fi; - - echo "***SUBTEST: check 2016-03-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -95,7 +95,7 @@ fi; - - echo "***SUBTEST: check 2016-03-03" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-03-03 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-03-03 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -109,7 +109,7 @@ fi; - - echo "***SUBTEST: check 2016-12-31" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-12-31 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-12-31 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -123,7 +123,7 @@ fi; - - echo "***SUBTEST: check 2017-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2017-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2017-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -137,7 +137,7 @@ fi; - - echo "***SUBTEST: check 2020-03-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2020-03-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2020-03-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -151,7 +151,7 @@ fi; - - echo "***SUBTEST: check 2038-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2038-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2038-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -168,7 +168,7 @@ rsyslog_testbench_require_y2k38_support - - echo "***SUBTEST: check 2038-12-31" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2038-12-31 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2038-12-31 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -182,7 +182,7 @@ fi; - - echo "***SUBTEST: check 2040-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2040-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2040-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -196,7 +196,7 @@ fi; - - echo "***SUBTEST: check 2040-12-31" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2040-12-31 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2040-12-31 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -210,7 +210,7 @@ fi; - - echo "***SUBTEST: check 2100-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2100-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2100-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -diff --git a/tests/timegenerated-utc-legacy.sh b/tests/timegenerated-utc-legacy.sh -index f893377..60296d3 100755 ---- a/tests/timegenerated-utc-legacy.sh -+++ b/tests/timegenerated-utc-legacy.sh -@@ -26,7 +26,7 @@ template(name="outfmt" type="string" - - echo "***SUBTEST: check 2016-03-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -diff --git a/tests/timegenerated-utc.sh b/tests/timegenerated-utc.sh -index 651408c..5d32e36 100755 ---- a/tests/timegenerated-utc.sh -+++ b/tests/timegenerated-utc.sh -@@ -28,7 +28,7 @@ template(name="outfmt" type="list") { - - echo "***SUBTEST: check 2016-03-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -diff --git a/tests/timegenerated-uxtimestamp-invld.sh b/tests/timegenerated-uxtimestamp-invld.sh -index 90bcf74..76a353c 100755 ---- a/tests/timegenerated-uxtimestamp-invld.sh -+++ b/tests/timegenerated-uxtimestamp-invld.sh -@@ -25,7 +25,7 @@ template(name="outfmt" type="string" - - echo "***SUBTEST: check 1800-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '1800-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='1800-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -40,7 +40,7 @@ fi; - - echo "***SUBTEST: check 1960-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '1960-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='1960-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -55,7 +55,7 @@ fi; - - echo "***SUBTEST: check 2101-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2101-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='2101-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -70,7 +70,7 @@ fi; - - echo "***SUBTEST: check 2500-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2500-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='2500-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -diff --git a/tests/timegenerated-uxtimestamp.sh b/tests/timegenerated-uxtimestamp.sh -index b24f9c7..0eb2812 100755 ---- a/tests/timegenerated-uxtimestamp.sh -+++ b/tests/timegenerated-uxtimestamp.sh -@@ -25,7 +25,7 @@ template(name="outfmt" type="string" - - echo "***SUBTEST: check 1970-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '1970-01-01 00:00:00' $srcdir/diag.sh startup -+FAKETIME='1970-01-01 00:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -40,7 +40,7 @@ fi; - - echo "***SUBTEST: check 2000-03-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2000-03-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2000-03-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -55,7 +55,7 @@ fi; - - echo "***SUBTEST: check 2016-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -70,7 +70,7 @@ fi; - - echo "***SUBTEST: check 2016-02-29" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-02-29 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-02-29 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -85,7 +85,7 @@ fi; - - echo "***SUBTEST: check 2016-03-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -100,7 +100,7 @@ fi; - - echo "***SUBTEST: check 2016-03-03" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-03-03 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-03-03 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -115,7 +115,7 @@ fi; - - echo "***SUBTEST: check 2016-12-31" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2016-12-31 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-12-31 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -130,7 +130,7 @@ fi; - - echo "***SUBTEST: check 2017-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2017-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2017-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -145,7 +145,7 @@ fi; - - echo "***SUBTEST: check 2020-03-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2020-03-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2020-03-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -160,7 +160,7 @@ fi; - - echo "***SUBTEST: check 2038-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2038-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2038-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -172,13 +172,11 @@ if [ ! $? -eq 0 ]; then - exit 1 - fi; - -- - rsyslog_testbench_require_y2k38_support - -- - echo "***SUBTEST: check 2040-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2040-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2040-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -@@ -193,7 +191,7 @@ fi; - - echo "***SUBTEST: check 2100-01-01" - rm -f rsyslog.out.log # do cleanup of previous subtest --faketime -f '2100-01-01 12:00:00' $srcdir/diag.sh startup -+FAKETIME='2100-01-01 12:00:00' $srcdir/diag.sh startup - . $srcdir/diag.sh tcpflood -m1 - . $srcdir/diag.sh shutdown-when-empty - . $srcdir/diag.sh wait-shutdown -diff --git a/tests/timegenerated-ymd.sh b/tests/timegenerated-ymd.sh -index 66b364b..f5f9213 100755 ---- a/tests/timegenerated-ymd.sh -+++ b/tests/timegenerated-ymd.sh -@@ -19,7 +19,7 @@ template(name="outfmt" type="string" - :msg, contains, "msgnum:" action(type="omfile" template="outfmt" - file="rsyslog.out.log") - ' --faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup -+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup - # what we send actually is irrelevant, as we just use system properties. - # but we need to send one message in order to gain output! - . $srcdir/diag.sh tcpflood -m1 --- -2.8.1 - |