X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2d432dfd22141f9933cac8ab3e26a8babaf87bef..a1ebfb2e46e13ee87afc91856a4af38175735d74:/test/scripts/0000-Basic/0601?ds=sidebyside

diff --git a/test/scripts/0000-Basic/0601 b/test/scripts/0000-Basic/0601
index 360d536c0..5fcce7cac 100644
--- a/test/scripts/0000-Basic/0601
+++ b/test/scripts/0000-Basic/0601
@@ -1,17 +1,109 @@
-# udpsend
-#need_ipv4
+# syslog logging
+#
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex
+****
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex
+****
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex
+****
+# plus tz + ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex
+****
+# plus pid
+exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex
+****
+# plus pid + tz
+exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex
+****
+# plus pid + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex
+****
+# plus pid + tz + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex
+****
 #
 #
-perl aux-fixed/0601.udpserver
+# syslog plus pid
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex
+****
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex
+****
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex
+****
+# plus tz + ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex
+****
+# plus pid
+exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex
+****
+# plus pid + tz
+exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex
+****
+# plus pid + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex
+****
+# plus pid + tz + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex
 ****
 #
-exim -bs -odi
-mail from:someone@some.domain
-rcpt to:CALLER@HOSTNAME
-data
-This is a test message.
-.
-quit
+#
+# syslog plus time
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex
+****
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex
 ****
-sleep 2
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex
+****
+# plus tz + ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex
+****
+# plus pid
+exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex
+****
+# plus pid + tz
+exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex
+****
+# plus pid + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex
+****
+# plus pid + tz + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex
+****
+#
+#
+# syslog plus pid + time
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex
+****
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex
+****
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex
+****
+# plus tz + ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex
+****
+# plus pid
+exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex
+****
+# plus pid + tz
+exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex
+****
+# plus pid + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex
+****
+# plus pid + tz + ms
+exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex
+****
+#
 no_msglog_check