Setting LC_ALL with make overrode this sort check

[exim.git] / test / stderr / 0487

diff --git a/test/stderr/0487 b/test/stderr/0487
index f380ec1d3ac4428d36bfacd9974ca87a5695da32..448754ed5cb36a7eacd704876ffe86657077feca 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -1,33 +1,38 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp

+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp

-finduser used cached passwd data for CALLER
+seeking password data for user "CALLER": using cached result
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL

+set_process_info: pppp accepting a local SMTP message from <CALLER>

  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER

-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< ehlo x.y
  in pipelining_advertise_hosts? yes (matched "*")
 smtp_setup_msg entered
 SMTP<< ehlo x.y
  in pipelining_advertise_hosts? yes (matched "*")

-SMTP>> 250-myhost.test.ex Hello CALLER at x.y\r
-250-SIZE 52428800\r
-250-PIPELINING\r
-250 HELP\r
+SMTP>> 250-myhost.test.ex Hello CALLER at x.y
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP

 SMTP<< mail from:<x@y>
 SMTP<< mail from:<x@y>

-SMTP>> 250 OK\r
+SMTP>> 250 OK

 SMTP<< rcpt to:<userx@test.ex>
 processing "accept"
 SMTP<< rcpt to:<userx@test.ex>
 processing "accept"

-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in inline ACL
+SMTP>> 250 Accepted

 SMTP<< data
 SMTP<< data

-SMTP>> 354 Enter message, ending with "." on a line by itself\r
+SMTP>> 354 Enter message, ending with "." on a line by itself

 search_tidyup called
 >>Headers received:
 From: unqualified
 search_tidyup called
 >>Headers received:
 From: unqualified


@@ -54,16 +59,19 @@ Size of headers = sss
 LOG: MAIN
   <= x@y U=CALLER P=local-esmtp S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= x@y U=CALLER P=local-esmtp S=sss
 created log directory TESTSUITE/spool/log

-SMTP>> 250 OK id=10HmaX-0005vi-00\r
+SMTP>> 250 OK id=10HmaX-0005vi-00

 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp

+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-finduser used cached passwd data for CALLER
+seeking password data for user "CALLER": using cached result
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaX-0005vi-00
 reading spool file 10HmaX-0005vi-00-H
 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaX-0005vi-00
 reading spool file 10HmaX-0005vi-00-H


@@ -135,11 +143,11 @@ hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
 lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx

-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0

 rewrite_one_header: type=F:
   From: unqualified
 rewrite_one_header: type=F:
   From: unqualified

-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0

 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
 journalling userx@test.ex
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
 journalling userx@test.ex


@@ -166,7 +174,7 @@ search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 smtp_setup_msg entered
 SMTP<< quit
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 smtp_setup_msg entered
 SMTP<< quit

-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection

 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called