Attempt egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0630

diff --git a/test/stderr/0630 b/test/stderr/0630
index f1845d1d7bc06916cd24b994623a6170c70051f6..e21a0fdf37a57a7df581aeee080901068d748fbf 100644 (file)
--- a/test/stderr/0630
+++ b/test/stderr/0630
@@ -1,7 +1,4 @@
-01:01:01 p1235  Considering: dest3@test.ex
-01:01:01 p1235  unique = dest3@test.ex
-01:01:01 p1235  no   domain  retry record
-01:01:01 p1235  no   address retry record
+01:01:01 p1235   no   address retry record
 01:01:01 p1235  dest3@test.ex: queued for routing
 01:01:01 p1235  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1235  routing dest3@test.ex
@@ -11,15 +8,18 @@
 01:01:01 p1235   ╭considering: /$local_part
 01:01:01 p1235   ├───────text: /
 01:01:01 p1235   ├considering: $local_part
-01:01:01 p1235   ├──expanding: /$local_part
+01:01:01 p1235   ├──────value: dest3
+01:01:01 p1235              ╰──(tainted)
+01:01:01 p1235   ├───expanded: /$local_part
 01:01:01 p1235   ╰─────result: /dest3
 01:01:01 p1235              ╰──(tainted)
-01:01:01 p1235  list element: /dest3
+01:01:01 p1235  dest3 in local_parts?
+01:01:01 p1235   list element: /dest3
 01:01:01 p1235  LOG: MAIN PANIC
 01:01:01 p1235    Tainted filename '/dest3'
 01:01:01 p1235  LOG: MAIN PANIC DIE
-01:01:01 p1235    failed to open /dest3 when checking "/$local_part": Permission denied (euid=uuuu egid=EXIM_GID)
-01:01:01 p1235  search_tidyup called
+01:01:01 p1235    failed to open /dest3 when checking local_parts: Permission denied (euid=uuuu egid=EXIM_GID)
+01:01:01 p1235   search_tidyup called
 01:01:01 p1235  >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept-delivery) terminating with rc=1 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********