Testsuite: munge for non-WITH_CONTENT_SCAN builds

[exim.git] / test / stdout / 0002

diff --git a/test/stdout/0002 b/test/stdout/0002
index 1da46e7a09292f45d393aaa1facde2d95fcb8429..0524afd7b87e0c7bc8b6eab21b99bc19569460ad 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -452,6 +452,7 @@ newline     tab\134backslash ~tilde\177DEL\200\201.
 > gei:    y
 > 
 > isip:   y  1.2.3.4
 > gei:    y
 > 
 > isip:   y  1.2.3.4

+> isip:   n  1.2.3

 > isip4:  y  1.2.3.4
 > isip6:  n  1.2.3.4
 > isip:   n  ::1.2.3.256
 > isip4:  y  1.2.3.4
 > isip6:  n  1.2.3.4
 > isip:   n  ::1.2.3.256


@@ -465,10 +466,14 @@ newline   tab\134backslash ~tilde\177DEL\200\201.
 > isip:   y  fe80::a00:20ff:fe86:a061
 > isip4:  n  fe80::a00:20ff:fe86:a061
 > isip6:  y  fe80::a00:20ff:fe86:a061
 > isip:   y  fe80::a00:20ff:fe86:a061
 > isip4:  n  fe80::a00:20ff:fe86:a061
 > isip6:  y  fe80::a00:20ff:fe86:a061

+> isip6:  n   fe80:a00:20ff:fe86:a061

 > isip:   y  fe80::1.2.3.4
 > isip:   n  rhubarb
 > isip4:  n  rhubarb
 > isip6:  n  rhubarb
 > isip:   y  fe80::1.2.3.4
 > isip:   n  rhubarb
 > isip4:  n  rhubarb
 > isip6:  n  rhubarb

+> isip6:  n  ::/100
+> isip6:  n  ::/foo
+> isip6:  n  ::/f o

 > 
 > match:  cdab
 > match:  cdab
 > 
 > match:  cdab
 > match:  cdab


@@ -696,6 +701,7 @@ newline     tab\134backslash ~tilde\177DEL\200\201.
 > abcdea a   z   zbcdez
 > abcdea a       abcdea
 > abcdea abc z   zzzdez
 > abcdea a   z   zbcdez
 > abcdea a       abcdea
 > abcdea abc z   zzzdez

+> (null)         ''

 > 
 > # Boolean
 > "TrUe"                true      EXPECT: true
 > 
 > # Boolean
 > "TrUe"                true      EXPECT: true


@@ -945,6 +951,13 @@ xyz
 > <>
 > expect: <>
 > 
 > <>
 > expect: <>
 > 

+> # string value with embedded comma
+> <Doe, John>
+> expect <Doe, John>
+> # string value with embedded doublequote
+> <word1 \" word2>
+> expect <word1 \" word2>
+> 

 > yes
 > yes
 > 
 > yes
 > yes
 > 


@@ -957,12 +970,14 @@ xyz
 > Failed: "if" failed and "fail" requested
 > yes
 > match_address:   no
 > Failed: "if" failed and "fail" requested
 > yes
 > match_address:   no

+> protected:  

 > 
 > primary_hostname: myhost.test.ex
 > match:  cdab
 > Failed: "if" failed and "fail" requested
 > yes
 > match_address:   no
 > 
 > primary_hostname: myhost.test.ex
 > match:  cdab
 > Failed: "if" failed and "fail" requested
 > yes
 > match_address:   no

+> protected:  

 > 
 > -be Sender host name and address etc, all unset
 > -oMa  sender_host_address = 
 > 
 > -be Sender host name and address etc, all unset
 > -oMa  sender_host_address = 


@@ -1079,6 +1094,7 @@ xyz
 221 myhost.test.ex closing connection\r
 > match_ip:        15 
 > match_ip:        16 
 221 myhost.test.ex closing connection\r
 > match_ip:        15 
 > match_ip:        16 

+> match_ip:        17 

 > 
 > in list
 > in list
 > 
 > in list
 > in list