Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / test / stderr / 0437

diff --git a/test/stderr/0437 b/test/stderr/0437
index ce327a329f7cf3786e84ba56d0dc5f6ace1e3502..0e5a5b3e96cc7b4deb1463513cc9cd6391a6e5e5 100644 (file)
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -1,12 +1,12 @@
 Exim version x.yz ....
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
 Exim version x.yz ....
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   key="spool" partial=-1 affix=NULL starflags=0
+   key="spool" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   type=lsearch key="spool"
+   type=lsearch key="spool" opts=NULL

  file lookup required for spool
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: spool
  file lookup required for spool
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: spool


@@ -18,12 +18,12 @@ LOG: queue_run MAIN
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   key="transport" partial=-1 affix=NULL starflags=0
+   key="transport" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   type=lsearch key="transport"
+   type=lsearch key="transport" opts=NULL

  file lookup required for transport
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: t1
  file lookup required for transport
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: t1


@@ -31,12 +31,12 @@ search_tidyup called
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   key="file" partial=-1 affix=NULL starflags=0
+   key="file" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   type=lsearch key="file"
+   type=lsearch key="file" opts=NULL

  file lookup required for file
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: file
  file lookup required for file
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: file


@@ -50,12 +50,12 @@ search_tidyup called
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   key="transport" partial=-1 affix=NULL starflags=0
+   key="transport" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   type=lsearch key="transport"
+   type=lsearch key="transport" opts=NULL

  file lookup required for transport
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: t1
  file lookup required for transport
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: t1


@@ -63,12 +63,12 @@ search_tidyup called
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"
 search_tidyup called
  search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
  search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   key="file" partial=-1 affix=NULL starflags=0
+   key="file" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
  LRU list:
    0TESTSUITE/aux-fixed/0437.ls
    End
  internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"

-   type=lsearch key="file"
+   type=lsearch key="file" opts=NULL

  file lookup required for file
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: file
  file lookup required for file
    in TESTSUITE/aux-fixed/0437.ls
  lookup yielded: file


@@ -82,4 +82,4 @@ search_tidyup called
 LOG: queue_run MAIN
   End queue run: pid=pppp
 search_tidyup called
 LOG: queue_run MAIN
   End queue run: pid=pppp
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>