Moved a debug statement to avoid a testing race.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 27c74dabb67b3eec85c42bbd79853b60ffe025e2..7ac300ce216565ddbdfa032467bf9207a6e30a78 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.276 2005/12/15 11:18:21 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.277 2005/12/15 15:44:46 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -43,6 +43,9 @@ PH/07 Two small changes when running in the test harness: increase delay when
 PH/08 Changed debug output of dbfn_open() flags from numbers to names, so as to
       be the same on different OS.
 
 PH/08 Changed debug output of dbfn_open() flags from numbers to names, so as to
       be the same on different OS.
 

+PH/09 Moved a debug statement in filter processing to avoid a race problem when
+      testing.
+

 
 Exim version 4.60
 -----------------
 
 Exim version 4.60
 -----------------

diff --git a/src/src/rda.c b/src/src/rda.c
index 1c45f7bb3bb0bcffe81ea5c295c24ac0deba7d78..1acc752880f9a3ca58ee1468c94493bd19acf66a 100644 (file)
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/rda.c,v 1.10 2005/08/08 13:21:46 ph10 Exp $ */
+/* $Cambridge: exim/src/src/rda.c,v 1.11 2005/12/15 15:44:46 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -770,14 +770,6 @@ if (read(fd, filtertype, sizeof(int)) != sizeof(int) ||
     read(fd, &yield, sizeof(int)) != sizeof(int) ||
     !rda_read_string(fd, error)) goto DISASTER;
 
     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);
-

 /* Read the contents of any syntax error blocks if we have a pointer */
 
 if (eblockp != NULL)
 /* Read the contents of any syntax error blocks if we have a pointer */
 
 if (eblockp != NULL)


@@ -934,6 +926,9 @@ while ((rc = wait(&status)) != pid)
     }
   }
 
     }
   }
 

+DEBUG(D_route)
+  debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error);
+

 if (had_disaster)
   {
   *error = string_sprintf("internal problem in %s: failure to transfer "
 if (had_disaster)
   {
   *error = string_sprintf("internal problem in %s: failure to transfer "