Testsuite: tidying GnuTLS with TLS1.3

[exim.git] / test / scripts / 0000-Basic / 0615

diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615
index 9057363f31358a2e7268513acc37e984ece31c8d..5fcce7caccd0c559e1a337e3873ef8ab4497e883 100644 (file)
--- a/test/scripts/0000-Basic/0615
+++ b/test/scripts/0000-Basic/0615
@@ -1,13 +1,109 @@
-# Environment
-# settings
-FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP keep_environment add_environment
+# syslog logging
+#
+# basic
+exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex

 ****
 ****

-# result via -bP enviroment
-FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP environment
+# plus tz
+exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex

 ****
 ****

-# result via -n -bP enviroment
-FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -n -bP environment
+# plus ms
+exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex

 ****
 ****

-# result via perl_at_start
-FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -ps -be ''
-***
+# 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
+****
+#
+#
+# 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
+****
+#
+#
+# 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
+****
+# 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