[exim-cvs] More testsuite fixes

Góra strony
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
Dla: exim-cvs
Temat: [exim-cvs] More testsuite fixes
Gitweb: http://git.exim.org/exim.git/commitdiff/a769a5017518b850dca541f3e873fcfbc772f782
Commit:     a769a5017518b850dca541f3e873fcfbc772f782
Parent:     5f122889caaa3746001f7e1f8e5caca6f6181393
Author:     Phil Pennock <pdp@???>
AuthorDate: Sun Oct 9 23:43:13 2011 -0400
Committer:  Phil Pennock <pdp@???>
CommitDate: Sun Oct 9 23:43:13 2011 -0400


    More testsuite fixes
---
 test/confs/1003                           |    2 +-
 test/mail/5007.userx/new/1.myhost.test.ex |    2 +-
 test/patchexim                            |    2 +-
 test/runtest                              |    5 ++++-
 test/stdout/0002                          |    4 ++++
 5 files changed, 11 insertions(+), 4 deletions(-)


diff --git a/test/confs/1003 b/test/confs/1003
index c3b4bf5..00cb5c1 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 e33e57f..c077e2b 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@???>)
     id 10HmaX-0005vi-00
     for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000


Test message
diff --git a/test/patchexim b/test/patchexim
index 1143741..91bf98a 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 4f1d18e..6a6aadd 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 c469ce2..e209ada 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
>