ph10 2004/11/24 16:14:50 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src queue.c
exim-test-orig/AutoTest/stderr 581
Log:
Testing tweak to improve repeatability.
Revision Changes Path
1.39 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.3 +1 -0 exim/exim-src/src/queue.c
1.3 +4 -1 exim/exim-test-orig/AutoTest/stderr/581
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog 24 Nov 2004 15:43:36 -0000 1.38
+++ ChangeLog 24 Nov 2004 16:14:50 -0000 1.39
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.38 2004/11/24 15:43:36 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.39 2004/11/24 16:14:50 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -168,6 +168,9 @@
domain.
39. Added log_selector=+queue_time_overall.
+
+40. When running the queue in the test harness, wait just a tad after forking a
+ delivery process, to get repeatability of debugging output.
Exim version 4.43
Index: queue.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/queue.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- queue.c 5 Nov 2004 14:59:12 -0000 1.2
+++ queue.c 24 Nov 2004 16:14:50 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/queue.c,v 1.2 2004/11/05 14:59:12 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/queue.c,v 1.3 2004/11/24 16:14:50 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -615,6 +615,7 @@
if ((pid = fork()) == 0)
{
int rc;
+ if (running_in_test_harness) millisleep(100);
(void)close(pfd[pipe_read]);
rc = deliver_message(f->text, force_delivery, FALSE);
_exit(rc == DELIVER_NOT_ATTEMPTED);
Index: 581
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/581,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 581 19 Oct 2004 14:31:15 -0000 1.2
+++ 581 24 Nov 2004 16:14:50 -0000 1.3
@@ -339,7 +339,10 @@
set_process_info: 21680 delivering 10HmaY-0005vi-00 (just run t1 for ph10@??? in subprocess)
search_tidyup called
reading pipe for subprocess 12345 (not ended)
-read() yielded 103
+read() yielded 5
+selecting on subprocess pipes
+reading pipe for subprocess 12345 (not ended)
+read() yielded 98
reading retry information for T:127.0.0.1:127.0.0.1:1225 from subprocess
added retry item
Z0 item read
