ph10 2005/08/08 14:21:46 BST
Modified files:
exim-src/src rda.c
exim-test-orig/AutoTest/stdout 001 002
Log:
Small delay in test harness to ensure debugging output comes out in the
same order.
Revision Changes Path
1.10 +5 -0 exim/exim-src/src/rda.c
1.16 +1 -0 exim/exim-test-orig/AutoTest/stdout/001
1.13 +1 -0 exim/exim-test-orig/AutoTest/stdout/002
Index: rda.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/rda.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rda.c 2 Aug 2005 13:43:04 -0000 1.9
+++ rda.c 8 Aug 2005 13:21:46 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/rda.c,v 1.9 2005/08/02 13:43:04 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/rda.c,v 1.10 2005/08/08 13:21:46 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -769,6 +769,11 @@
if (read(fd, filtertype, sizeof(int)) != sizeof(int) ||
read(fd, &yield, sizeof(int)) != sizeof(int) ||
!rda_read_string(fd, error)) goto DISASTER;
+
+/* In the test harness, give the subprocess time to finish off and write
+any debugging output. */
+
+if (running_in_test_harness) millisleep(250);
DEBUG(D_route)
debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error);
Index: 001
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/001,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- 001 2 Aug 2005 11:22:24 -0000 1.15
+++ 001 8 Aug 2005 13:21:46 -0000 1.16
@@ -171,6 +171,7 @@
spamd_address = 127.0.0.1 783
no_split_spool_directory
spool_directory = /var/spool/exim
+sqlite_lock_timeout = 5
no_strip_excess_angle_brackets
no_strip_trailing_dot
syslog_duplication
Index: 002
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/002,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- 002 2 Aug 2005 11:22:24 -0000 1.12
+++ 002 8 Aug 2005 13:21:46 -0000 1.13
@@ -171,6 +171,7 @@
spamd_address = 1.2.3.4 123
no_split_spool_directory
spool_directory = /source/exim4/AutoTest/spool
+sqlite_lock_timeout = 5
no_strip_excess_angle_brackets
no_strip_trailing_dot
no_syslog_duplication
