diff options
| author | Phil Pennock <pdp@exim.org> | 2011-10-09 23:43:13 -0400 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2011-10-09 23:43:13 -0400 |
| commit | a769a5017518b850dca541f3e873fcfbc772f782 (patch) | |
| tree | b083c012cbada8114626fd2284d56f8d230e67bc | |
| parent | 5f122889caaa3746001f7e1f8e5caca6f6181393 (diff) | |
More testsuite fixes
| -rw-r--r-- | test/confs/1003 | 2 | ||||
| -rw-r--r-- | test/mail/5007.userx/new/1.myhost.test.ex | 2 | ||||
| -rwxr-xr-x | test/patchexim | 2 | ||||
| -rwxr-xr-x | test/runtest | 5 | ||||
| -rw-r--r-- | test/stdout/0002 | 4 |
5 files changed, 11 insertions, 4 deletions
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 > |