From: Phil Pennock <pdp@exim.org>
Date: Mon, 10 Oct 2011 03:43:13 +0000 (-0400)
Subject: More testsuite fixes
X-Git-Tag: exim-4_77~3
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a769a5017518b850dca541f3e873fcfbc772f782;p=exim.git

More testsuite fixes
---

diff --git a/test/confs/1003 b/test/confs/1003
index c3b4bf5aa..00cb5c13c 100644
--- a/test/confs/1003
+++ b/test/confs/1003
@@ -1,4 +1,4 @@
-# Exim test configuration 264
+# Exim test configuration 1003
 
 SERVER =
 
diff --git a/test/mail/5007.userx/new/1.myhost.test.ex b/test/mail/5007.userx/new/1.myhost.test.ex
index e33e57fdb..c077e2b7e 100644
--- a/test/mail/5007.userx/new/1.myhost.test.ex
+++ b/test/mail/5007.userx/new/1.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
diff --git a/test/patchexim b/test/patchexim
index 1143741fb..91bf98a42 100755
--- a/test/patchexim
+++ b/test/patchexim
@@ -16,7 +16,7 @@ open(OUT, ">eximdir/exim") || die "** Failed to open eximdir/exim: $!\n";
 while(<IN>)
   {
   s/>>>running<<</<<<testing>>>/;
-  s/(\d+\.\d+(?:\.\d+)?(-RC\d+|-dev)?\0<<eximversion>>)/"x.yz\0" . ("*" x (length($1) - 5))/e;
+  s/(\d+\.\d+(?:\.\d+)?([_-]RC\d+|[_-]dev)?(?:[0-9a-fA-F-]*)\0<<eximversion>>)/"x.yz\0" . ("*" x (length($1) - 5))/e;
   print OUT;
   }
 
diff --git a/test/runtest b/test/runtest
index 4f1d18edb..6a6aadd97 100755
--- a/test/runtest
+++ b/test/runtest
@@ -311,7 +311,8 @@ RESET_AFTER_EXTRA_LINE_READ:
   s?\Q$parm_cwd\E?TESTSUITE?g;
 
   # Replace the Exim version number (may appear in various places)
-  s/Exim \d+\.\d+[\w-]*/Exim x.yz/i;
+  # patchexim should have fixed this for us
+  #s/(Exim) \d+\.\d+[\w-]*/$1 x.yz/i;
 
   # Replace Exim message ids by a unique series
   s/((?:[^\W_]{6}-){2}[^\W_]{2})
@@ -738,6 +739,8 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # drop lookups
     next if /^Lookups \(built-in\):/;
+    next if /^Loading lookup modules from/;
+    next if /^Loaded \d+ lookup modules/;
     next if /^Total \d+ lookups/;
 
     # drop compiler information
diff --git a/test/stdout/0002 b/test/stdout/0002
index c469ce2f5..e209ada6e 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -521,6 +521,8 @@
 > Failed: unrecognised boolean value "text"
 > Failed: unrecognised boolean value "text"
 > "00"                  false     EXPECT: false
+> "!true"               false     EXPECT: false
+> "!false"              true      EXPECT: true
 > 
 > "TrUe"                true      EXPECT: true
 > "FALSE"               false     EXPECT: false
@@ -540,6 +542,8 @@
 > "text "               true      EXPECT: true
 > " text "              true      EXPECT: true
 > "00"                  true      EXPECT: true
+> "!true"               false     EXPECT: false
+> "!false"              true      EXPECT: true
 > 
 > # RFC 2047
 >