[exim-cvs] Update testsuite outputs to match 333b9d.

Kezdőlap
Üzenet törlése
Válasz az üzenetre
Szerző: Exim Git Commits Mailing List
Dátum:  
Címzett: exim-cvs
Tárgy: [exim-cvs] Update testsuite outputs to match 333b9d.
Gitweb: http://git.exim.org/exim.git/commitdiff/cd5567b149ce1b810dbc06f521ad480d9be533bd
Commit:     cd5567b149ce1b810dbc06f521ad480d9be533bd
Parent:     2c422e6fc9bc1bd15a0d86ab8dbaae6409989924
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Oct 27 15:04:11 2012 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Oct 27 15:04:11 2012 +0100


    Update testsuite outputs to match 333b9d.
---
 test/stderr/0021 |   26 ++--
 test/stderr/0085 |   24 ++--
 test/stderr/0279 |   12 +-
 test/stderr/0362 |    2 +-
 test/stderr/0388 |    8 +-
 test/stderr/0391 |    2 +-
 test/stderr/0398 |   12 +-
 test/stderr/0471 |  330 +++++++++++++++++++++++++++---------------------------
 test/stderr/0479 |    2 +-
 test/stderr/2201 |    2 +-
 test/stderr/5005 |    4 +-
 11 files changed, 212 insertions(+), 212 deletions(-)


diff --git a/test/stderr/0021 b/test/stderr/0021
index 28be74e..4f43e05 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -30,13 +30,13 @@ accept: condition test succeeded in ACL "connect"
using ACL "mail"
processing "warn"
check senders = ok@test3
-address match: subject=bad@test1 pattern=ok@test3
+address match test: subject=bad@test1 pattern=ok@test3
bad@test1 in "ok@test3"? no (end of list)
warn: condition test failed in ACL "mail"
processing "accept"
check senders = ok@test1 : ok@test3
-address match: subject=bad@test1 pattern=ok@test1
-address match: subject=bad@test1 pattern=ok@test3
+address match test: subject=bad@test1 pattern=ok@test1
+address match test: subject=bad@test1 pattern=ok@test3
bad@test1 in "ok@test1 : ok@test3"? no (end of list)
accept: condition test failed in ACL "mail"
end of ACL "mail": implicit DENY
@@ -45,13 +45,13 @@ LOG: MAIN REJECT
using ACL "mail"
processing "warn"
check senders = ok@test3
-address match: subject=ok@test1 pattern=ok@test3
+address match test: subject=ok@test1 pattern=ok@test3
test1 in "test3"? no (end of list)
ok@test1 in "ok@test3"? no (end of list)
warn: condition test failed in ACL "mail"
processing "accept"
check senders = ok@test1 : ok@test3
-address match: subject=ok@test1 pattern=ok@test1
+address match test: subject=ok@test1 pattern=ok@test1
test1 in "test1"? yes (matched "test1")
ok@test1 in "ok@test1 : ok@test3"? yes (matched "ok@test1")
check verify = sender
@@ -66,9 +66,9 @@ accept: condition test succeeded in ACL "mail"
using ACL "rcpt"
processing "accept"
check senders = +ok_senders
-address match: subject=ok@test1 pattern=ok@somewhere
+address match test: subject=ok@test1 pattern=ok@somewhere
test1 in "somewhere"? no (end of list)
-address match: subject=ok@test1 pattern=ok@test1
+address match test: subject=ok@test1 pattern=ok@test1
test1 in "test1"? yes (matched "test1")
ok@test1 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test1")
ok@test1 in "+ok_senders"? yes (matched "+ok_senders")
@@ -128,15 +128,15 @@ accept: condition test succeeded in ACL "connect"
using ACL "mail"
processing "warn"
check senders = ok@test3
-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3
test3 in "test3"? yes (matched "test3")
ok@test3 in "ok@test3"? yes (matched "ok@test3")
warn: condition test succeeded in ACL "mail"
processing "accept"
check senders = ok@test1 : ok@test3
-address match: subject=ok@test3 pattern=ok@test1
+address match test: subject=ok@test3 pattern=ok@test1
test3 in "test1"? no (end of list)
-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3
test3 in "test3"? yes (matched "test3")
ok@test3 in "ok@test1 : ok@test3"? yes (matched "ok@test3")
check verify = sender
@@ -151,11 +151,11 @@ accept: condition test succeeded in ACL "mail"
using ACL "rcpt"
processing "accept"
check senders = +ok_senders
-address match: subject=ok@test3 pattern=ok@somewhere
+address match test: subject=ok@test3 pattern=ok@somewhere
test3 in "somewhere"? no (end of list)
-address match: subject=ok@test3 pattern=ok@test1
+address match test: subject=ok@test3 pattern=ok@test1
test3 in "test1"? no (end of list)
-address match: subject=ok@test3 pattern=ok@test3
+address match test: subject=ok@test3 pattern=ok@test3
test3 in "test3"? yes (matched "test3")
ok@test3 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test3")
ok@test3 in "+ok_senders"? yes (matched "+ok_senders")
diff --git a/test/stderr/0085 b/test/stderr/0085
index e39e568..92a8b70 100644
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -69,11 +69,11 @@ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
cached data used for lookup of smart.domain
in TESTSUITE/aux-fixed/0085.data
lookup yielded: x : y : abc@???
-address match: subject=abc@??? pattern=x
+address match test: subject=abc@??? pattern=x
d.e.f in "x"? no (end of list)
-address match: subject=abc@??? pattern=y
+address match test: subject=abc@??? pattern=y
d.e.f in "y"? no (end of list)
-address match: subject=abc@??? pattern=abc@???
+address match test: subject=abc@??? pattern=abc@???
d.e.f in "d.e.f"? yes (matched "d.e.f")
abc@??? in "x : y : abc@???"? yes (matched "abc@???")
calling smart1 router
@@ -138,11 +138,11 @@ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
cached data used for lookup of test.ex
in TESTSUITE/aux-fixed/0085.data
lookup yielded: x : y : abc@???
-address match: subject=abc@??? pattern=x
+address match test: subject=abc@??? pattern=x
d.e.f in "x"? no (end of list)
-address match: subject=abc@??? pattern=y
+address match test: subject=abc@??? pattern=y
d.e.f in "y"? no (end of list)
-address match: subject=abc@??? pattern=abc@???
+address match test: subject=abc@??? pattern=abc@???
d.e.f in "d.e.f"? yes (matched "d.e.f")
abc@??? in "x : y : abc@???"? yes (matched "abc@???")
checking require_files
@@ -268,11 +268,11 @@ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
cached data used for lookup of smart.domain
in TESTSUITE/aux-fixed/0085.data
lookup yielded: x : y : abc@???
-address match: subject=CALLER@??? pattern=x
+address match test: subject=CALLER@??? pattern=x
myhost.test.ex in "x"? no (end of list)
-address match: subject=CALLER@??? pattern=y
+address match test: subject=CALLER@??? pattern=y
myhost.test.ex in "y"? no (end of list)
-address match: subject=CALLER@??? pattern=abc@???
+address match test: subject=CALLER@??? pattern=abc@???
CALLER@??? in "x : y : abc@???"? no (end of list)
smart1 router skipped: senders mismatch
--------> fail_remote_domains router <--------
@@ -335,11 +335,11 @@ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
cached data used for lookup of test.ex
in TESTSUITE/aux-fixed/0085.data
lookup yielded: x : y : abc@???
-address match: subject=CALLER@??? pattern=x
+address match test: subject=CALLER@??? pattern=x
myhost.test.ex in "x"? no (end of list)
-address match: subject=CALLER@??? pattern=y
+address match test: subject=CALLER@??? pattern=y
myhost.test.ex in "y"? no (end of list)
-address match: subject=CALLER@??? pattern=abc@???
+address match test: subject=CALLER@??? pattern=abc@???
CALLER@??? in "x : y : abc@???"? no (end of list)
smart2 router skipped: senders mismatch
no more routers
diff --git a/test/stderr/0279 b/test/stderr/0279
index 5a3b7a0..a56ebe9 100644
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -20,17 +20,17 @@ routing CALLER@???
--------> rr1 router <--------
local_part=CALLER domain=test.ex
checking senders
-address match: subject=CALLER@??? pattern=user1@+funny_domains
+address match test: subject=CALLER@??? pattern=user1@+funny_domains
CALLER@??? in "user1@+funny_domains"? no (end of list)
rr1 router skipped: senders mismatch
--------> r1 router <--------
local_part=CALLER domain=test.ex
checking senders
-address match: subject=CALLER@??? pattern=never@???
+address match test: subject=CALLER@??? pattern=never@???
CALLER@??? in "never@???"? no (end of list)
-address match: subject=CALLER@??? pattern=never1@???
+address match test: subject=CALLER@??? pattern=never1@???
CALLER@??? in "never1@???"? no (end of list)
-address match: subject=CALLER@??? pattern=CALLER@???
+address match test: subject=CALLER@??? pattern=CALLER@???
test.ex in "test.ex"? yes (matched "test.ex")
CALLER@??? in "CALLER@???"? yes (matched "CALLER@???")
CALLER@??? in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")
@@ -40,7 +40,7 @@ local_part=CALLER domain=test.ex
checking senders
cached no match for +never_addresses
cached lookup data = NULL
-address match: subject=CALLER@??? pattern=never2@???
+address match test: subject=CALLER@??? pattern=never2@???
cached no match for +n1_addresses
cached lookup data = NULL
CALLER@??? in "<; never2@??? ; +n1_addresses"? no (end of list)
@@ -92,7 +92,7 @@ routing CALLER@???
--------> rr1 router <--------
local_part=CALLER domain=test.ex
checking senders
-address match: subject=user1@fun.1 pattern=user1@+funny_domains
+address match test: subject=user1@fun.1 pattern=user1@+funny_domains
fun.1 in "fun.1 : fun.2"? yes (matched "fun.1")
fun.1 in "+funny_domains"? yes (matched "+funny_domains")
user1@fun.1 in "user1@+funny_domains"? yes (matched "user1@+funny_domains")
diff --git a/test/stderr/0362 b/test/stderr/0362
index fac62e5..1406509 100644
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -40,7 +40,7 @@ a.b.c in "+relay_domains"? yes (matched "+relay_domains")
check verify = recipient
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Verifying x@???
-address match: subject=x@??? pattern=x@???
+address match test: subject=x@??? pattern=x@???
a.b.c in "a.b.c"? yes (matched "a.b.c")
x@??? in "x@???"? yes (matched "x@???")
LOG: address_rewrite MAIN
diff --git a/test/stderr/0388 b/test/stderr/0388
index f785582..98df1fd 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -95,7 +95,7 @@ LOG: MAIN
added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0
SMTP>> QUIT
set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for x@y: result OK
-address match: subject=*@127.0.0.1 pattern=*
+address match test: subject=*@127.0.0.1 pattern=*
127.0.0.1 in "*"? yes (matched "*")
*@127.0.0.1 in "*"? yes (matched "*")
checking status of V4NET.0.0.0
@@ -134,7 +134,7 @@ locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
-address match: subject=x@y pattern=*
+address match test: subject=x@y pattern=*
y in "*"? yes (matched "*")
x@y in "*"? yes (matched "*")
retry for R:x@y = * 0 0
@@ -144,7 +144,7 @@ Writing retry data for R:x@y
first failed=dddd last try=dddd next try=+1 expired=1
errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
dbfn_write: key=R:x@y
-address match: subject=*@V4NET.0.0.0 pattern=*
+address match test: subject=*@V4NET.0.0.0 pattern=*
V4NET.0.0.0 in "*"? yes (matched "*")
*@V4NET.0.0.0 in "*"? yes (matched "*")
retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0
@@ -236,7 +236,7 @@ local_part=CALLER domain=myhost.test.ex
checking local_parts
CALLER in "CALLER"? yes (matched "CALLER")
checking senders
-address match: subject= pattern=
+address match test: subject= pattern=
in ":"? yes (matched "")
calling r0 router
rda_interpret (string): :blackhole:
diff --git a/test/stderr/0391 b/test/stderr/0391
index 41f7035..e6fac47 100644
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -30,7 +30,7 @@ processing "accept"
check verify = sender
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Verifying U@???
-address match: subject=U@??? pattern=*@*.x.y
+address match test: subject=U@??? pattern=*@*.x.y
w.x.y in "*.x.y"? yes (matched "*.x.y")
U@??? in "*@*.x.y"? yes (matched "*@*.x.y")
LOG: address_rewrite MAIN
diff --git a/test/stderr/0398 b/test/stderr/0398
index db5c4cf..4e97f4e 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -21,7 +21,7 @@ SMTP<< rcpt to:<abc@local>
using ACL "rcpt"
processing "deny"
check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
remote in "remote"? yes (matched "remote")
qq@remote in "qq@remote"? yes (matched "qq@remote")
check !verify = sender
@@ -70,7 +70,7 @@ sender qq@remote verified ok
deny: condition test failed in ACL "rcpt"
processing "warn"
check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
remote in "remote"? yes (matched "remote")
qq@remote in "qq@remote"? yes (matched "qq@remote")
check !verify = sender/callout
@@ -150,7 +150,7 @@ LOG: MAIN
U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown
processing "accept"
check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
remote in "remote"? yes (matched "remote")
qq@remote in "qq@remote"? yes (matched "qq@remote")
accept: condition test succeeded in ACL "rcpt"
@@ -159,7 +159,7 @@ SMTP<< rcpt to:<xyz@local>
using ACL "rcpt"
processing "deny"
check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
remote in "remote"? yes (matched "remote")
qq@remote in "qq@remote"? yes (matched "qq@remote")
check !verify = sender
@@ -167,7 +167,7 @@ using cached sender verify result
deny: condition test failed in ACL "rcpt"
processing "warn"
check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
remote in "remote"? yes (matched "remote")
qq@remote in "qq@remote"? yes (matched "qq@remote")
check !verify = sender/callout
@@ -227,7 +227,7 @@ LOG: MAIN
U=CALLER Warning: Sender verify failed
processing "accept"
check senders = qq@remote
-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote
remote in "remote"? yes (matched "remote")
qq@remote in "qq@remote"? yes (matched "qq@remote")
accept: condition test succeeded in ACL "rcpt"
diff --git a/test/stderr/0471 b/test/stderr/0471
index f81cb2a..273100d 100644
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -96,7 +96,7 @@ To: random@???,

**** debug string too long - truncated ****

-address match: subject=r1@??? pattern=*@*
+address match test: subject=r1@??? pattern=*@*
 test.ex in "*"? yes (matched "*")
 r1@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -116,7 +116,7 @@ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
 file lookup required for *.test.ex
   in TESTSUITE/aux-fixed/0471.rw
 lookup failed
-address match: subject=CALLER@??? pattern=*@*
+address match test: subject=CALLER@??? pattern=*@*
 myhost.test.ex in "*"? yes (matched "*")
 CALLER@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -225,7 +225,7 @@ rewrite_one_header: type=T:
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -404,7 +404,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -583,7 +583,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -762,7 +762,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -941,7 +941,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1120,7 +1120,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1299,7 +1299,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1478,7 +1478,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1657,7 +1657,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1836,7 +1836,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2014,7 +2014,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2192,7 +2192,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2370,7 +2370,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2548,7 +2548,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2726,7 +2726,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2904,7 +2904,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3082,7 +3082,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3260,7 +3260,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3438,7 +3438,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3616,7 +3616,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3794,7 +3794,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3972,7 +3972,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4150,7 +4150,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4327,7 +4327,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4504,7 +4504,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4681,7 +4681,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4858,7 +4858,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5035,7 +5035,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5212,7 +5212,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5389,7 +5389,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5566,7 +5566,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5743,7 +5743,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5920,7 +5920,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6097,7 +6097,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6274,7 +6274,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6450,7 +6450,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6626,7 +6626,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6802,7 +6802,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6978,7 +6978,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7154,7 +7154,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7330,7 +7330,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7506,7 +7506,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7682,7 +7682,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7858,7 +7858,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8034,7 +8034,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8210,7 +8210,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8386,7 +8386,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8562,7 +8562,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8737,7 +8737,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8912,7 +8912,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9087,7 +9087,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9262,7 +9262,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9437,7 +9437,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9612,7 +9612,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9787,7 +9787,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9962,7 +9962,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10137,7 +10137,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10312,7 +10312,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10487,7 +10487,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10662,7 +10662,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10836,7 +10836,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11010,7 +11010,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11184,7 +11184,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11358,7 +11358,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11532,7 +11532,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11706,7 +11706,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11880,7 +11880,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12054,7 +12054,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12228,7 +12228,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12402,7 +12402,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12576,7 +12576,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12750,7 +12750,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12924,7 +12924,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13097,7 +13097,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13270,7 +13270,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13443,7 +13443,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13616,7 +13616,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13789,7 +13789,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13962,7 +13962,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14135,7 +14135,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14308,7 +14308,7 @@ remainder: random@???,
     random@???,
     random@???
 **** debug string too long - truncated ****
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14481,7 +14481,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14653,7 +14653,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14824,7 +14824,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14994,7 +14994,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15163,7 +15163,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15331,7 +15331,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15498,7 +15498,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15664,7 +15664,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15829,7 +15829,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15993,7 +15993,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16156,7 +16156,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16318,7 +16318,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16479,7 +16479,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16639,7 +16639,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16798,7 +16798,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16956,7 +16956,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17113,7 +17113,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17269,7 +17269,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17424,7 +17424,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17578,7 +17578,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17731,7 +17731,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17883,7 +17883,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18034,7 +18034,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18184,7 +18184,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18333,7 +18333,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18481,7 +18481,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18628,7 +18628,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18774,7 +18774,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18919,7 +18919,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19063,7 +19063,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19206,7 +19206,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19348,7 +19348,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19489,7 +19489,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19629,7 +19629,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19768,7 +19768,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19906,7 +19906,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20043,7 +20043,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20179,7 +20179,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20314,7 +20314,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20448,7 +20448,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20581,7 +20581,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20713,7 +20713,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20844,7 +20844,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20974,7 +20974,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21103,7 +21103,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21231,7 +21231,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21358,7 +21358,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21484,7 +21484,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21609,7 +21609,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21733,7 +21733,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21856,7 +21856,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21978,7 +21978,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22099,7 +22099,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22219,7 +22219,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22338,7 +22338,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22456,7 +22456,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22573,7 +22573,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22689,7 +22689,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22804,7 +22804,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22918,7 +22918,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23031,7 +23031,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23143,7 +23143,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23254,7 +23254,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23364,7 +23364,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23473,7 +23473,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23581,7 +23581,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23688,7 +23688,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23794,7 +23794,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23899,7 +23899,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24003,7 +24003,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24106,7 +24106,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24208,7 +24208,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24309,7 +24309,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24409,7 +24409,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24508,7 +24508,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24606,7 +24606,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24703,7 +24703,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24799,7 +24799,7 @@ remainder: random@???,
     random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24894,7 +24894,7 @@ To: random@???,
 remainder: random@???,
     random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24988,7 +24988,7 @@ To: random@???,
 **** debug string too long - truncated ****
 remainder: random@???,
     random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -25081,7 +25081,7 @@ To: random@???,
     random@???,
 **** debug string too long - truncated ****
 remainder: random@???
-address match: subject=random@??? pattern=*@*
+address match test: subject=random@??? pattern=*@*
 test.example in "*"? yes (matched "*")
 random@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -25176,7 +25176,7 @@ To: random@???,
 remainder: 
 rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@???>
-address match: subject=CALLER@??? pattern=*@*
+address match test: subject=CALLER@??? pattern=*@*
 myhost.test.ex in "*"? yes (matched "*")
 CALLER@??? in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
diff --git a/test/stderr/0479 b/test/stderr/0479
index c890a1f..92880dd 100644
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -40,7 +40,7 @@ LOG: MAIN
 check verify = sender

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Verifying a@b
-address match: subject=a@b pattern=a@b
+address match test: subject=a@b pattern=a@b
b in "b"? yes (matched "b")
a@b in "a@b"? yes (matched "a@b")
LOG: address_rewrite MAIN
diff --git a/test/stderr/2201 b/test/stderr/2201
index ca89d96..9d70d2a 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -103,7 +103,7 @@ cached data used for lookup of test.ex
lookup yielded: A TXT record for test.ex.
test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
checking senders
-address match: subject=CALLER@??? pattern=dnsdb;A=myhost.test.ex
+address match test: subject=CALLER@??? pattern=dnsdb;A=myhost.test.ex
search_open: dnsdb "NULL"
cached open
search_find: file="NULL"
diff --git a/test/stderr/5005 b/test/stderr/5005
index e27fbfa..e61cc77 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -493,7 +493,7 @@ locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
-address match: subject=userx@??? pattern=*
+address match test: subject=userx@??? pattern=*
test.ex in "*"? yes (matched "*")
userx@??? in "*"? yes (matched "*")
retry for T:userx@??? = * 0 0
@@ -665,7 +665,7 @@ locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
-address match: subject=userx@??? pattern=*
+address match test: subject=userx@??? pattern=*
test.ex in "*"? yes (matched "*")
userx@??? in "*"? yes (matched "*")
retry for T:userx@??? = * 0 0