More testsuite fixes

diff --git a/test/confs/1003 b/test/confs/1003
index c3b4bf5aae28159bf428fab2df5865866a9aac0c..00cb5c13cb046556f36ae0bea9c136943d0cf3d0 100644 (file)
--- a/test/confs/1003
+++ b/test/confs/1003
@@ -1,4 +1,4 @@
-# Exim test configuration 264
+# Exim test configuration 1003

 
 SERVER =
 
 
 SERVER =
 

diff --git a/test/mail/5007.userx/new/1.myhost.test.ex b/test/mail/5007.userx/new/1.myhost.test.ex
index e33e57fdbb173bbb43850702d358b9d444bc82bb..c077e2b7e94525ee5d276c6cdfc3826d377db5ad 100644 (file)
--- 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
        (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>
 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
 
 Test message

diff --git a/test/patchexim b/test/patchexim
index 1143741fb0fd1e2673b5c16d45779264cfcfbd0f..91bf98a42b10f4afc702979a20f5cb15c288e658 100755 (executable)
--- 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>>>/;
 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;
   }
 
   print OUT;
   }
 

diff --git a/test/runtest b/test/runtest
index 4f1d18edb8634726f7a6aa72f246452a06fcfe63..6a6aadd975d49644457ba909477811e4ba386d61 100755 (executable)
--- 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?\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})
 
   # 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\):/;
 
     # 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
     next if /^Total \d+ lookups/;
 
     # drop compiler information

diff --git a/test/stdout/0002 b/test/stdout/0002
index c469ce2f560bc9c2e2dfeaf2be3f0e0840a14bf9..e209ada6ecc34c28c131dc64dcd5a7be89f1fe81 100644 (file)
--- 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
 > 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
 > 
 > "TrUe"                true      EXPECT: true
 > "FALSE"               false     EXPECT: false


@@ -540,6 +542,8 @@
 > "text "               true      EXPECT: true
 > " text "              true      EXPECT: true
 > "00"                  true      EXPECT: true
 > "text "               true      EXPECT: true
 > " text "              true      EXPECT: true
 > "00"                  true      EXPECT: true

+> "!true"               false     EXPECT: false
+> "!false"              true      EXPECT: true

 > 
 > # RFC 2047
 > 
 > 
 > # RFC 2047
 >