summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2005-12-14 10:00:05 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2005-12-14 10:00:05 +0000
commited0e982047b9cb760f810e056d0faf79f1d44fa1 (patch)
tree4fae52f84899f12ca6498576bab9d679f5083396 /src
parent25a321c82da9565c7fd283d105eb1b7f81e078b5 (diff)
downloadexim4-ed0e982047b9cb760f810e056d0faf79f1d44fa1.tar.gz
Minor changes for the test harness.
Diffstat (limited to 'src')
-rw-r--r--src/src/smtp_in.c11
-rw-r--r--src/src/transport.c4
2 files changed, 3 insertions, 12 deletions
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 5c953375c..00d0fb259 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/smtp_in.c,v 1.27 2005/12/12 15:58:53 ph10 Exp $ */
+/* $Cambridge: exim/src/src/smtp_in.c,v 1.28 2005/12/14 10:00:05 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1133,15 +1133,6 @@ int size = 256;
int i, ptr;
uschar *p, *s, *ss;
-/* If we are running in the test harness, and the incoming call is from
-127.0.0.2 (sic), have a short delay. This makes it possible to test handling of
-input sent too soon (before the banner is output). */
-
-if (running_in_test_harness &&
- sender_host_address != NULL &&
- Ustrcmp(sender_host_address, "127.0.0.2") == 0)
- sleep(1);
-
/* Default values for certain variables */
helo_seen = esmtp = helo_accept_junk = FALSE;
diff --git a/src/src/transport.c b/src/src/transport.c
index e66e498be..cc6103df5 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transport.c,v 1.13 2005/08/01 14:41:25 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transport.c,v 1.14 2005/12/14 10:00:05 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1749,7 +1749,7 @@ if ((pid = fork()) == 0)
automatic comparison. */
if ((pid = fork()) != 0) _exit(EXIT_SUCCESS);
- if (running_in_test_harness) millisleep(500);
+ if (running_in_test_harness) sleep(1);
/* Set up the calling arguments; use the standard function for the basics,
but we have a number of extras that may be added. */