From 2eb77f91023a3279166810a7ce9f15508d244e65 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 9 Aug 2014 16:04:37 +0100
Subject: Ignore dane-related debug out in non-dane testcases

---
 test/runtest | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'test/runtest')

diff --git a/test/runtest b/test/runtest
index 926385f17..aeca824e1 100755
--- a/test/runtest
+++ b/test/runtest
@@ -994,6 +994,11 @@ RESET_AFTER_EXTRA_LINE_READ:
         @saved = ();
         }
 
+    # Skip hosts_require_dane checks when the options
+    # are unset, because dane ain't always there.
+
+    next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
+
       # Skip some lines that Exim puts out at the start of debugging output
       # because they will be different in different binaries.
 
-- 
cgit v1.2.3


From 770feb2f08f38dc1ac8e484659c60c8dd76d370c Mon Sep 17 00:00:00 2001
From: Todd Lyons <tlyons@exim.org>
Date: Thu, 14 Aug 2014 12:36:34 -0700
Subject: Properly detect/set test variables from scripts.

---
 doc/doc-txt/ChangeLog | 11 +++++++++++
 test/runtest          | 15 ++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'test/runtest')

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 615b4cf96..bb4752fbb 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -2,6 +2,17 @@ Change log file for Exim from version 4.21
 -------------------------------------------
 
 
+Exim version 4.85
+-----------------
+TL/01 When running the test suite, the README says that variables such as
+      no_msglog_check are global and can be placed anywhere in a specific
+      test's script, however it was observed that placement needed to be near
+      the beginning for it to behave that way. Changed the runtest perl
+      script to read through the entire script once to detect and set these
+      variables, reset to the beginning of the script, and then run through
+      the script parsing/test process like normal.
+
+
 Exim version 4.84
 -----------------
 TL/01 Bugzilla 1506: Re-add a 'return NULL' to silence complaints from static
diff --git a/test/runtest b/test/runtest
index aeca824e1..048fc2a0b 100755
--- a/test/runtest
+++ b/test/runtest
@@ -3358,9 +3358,20 @@ foreach $test (@test_list)
   undef %expected_msglogs;
 
   # Open the test's script
-
   open(SCRIPT, "scripts/$test") ||
     tests_exit(-1, "Failed to open \"scripts/$test\": $!");
+  # Run through the script once to set variables which should be global
+  while (<SCRIPT>)
+    {
+    if (/^no_message_check/) { $message_skip = 1; next; }
+    if (/^no_msglog_check/)  { $msglog_skip = 1; next; }
+    if (/^no_stderr_check/)  { $stderr_skip = 1; next; }
+    if (/^no_stdout_check/)  { $stdout_skip = 1; next; }
+    if (/^rmfiltertest/)     { $rmfiltertest = 1; next; }
+    if (/^sortlog/)          { $sortlog = 1; next; }
+    }
+  # Reset to beginning of file for per test interpreting/processing
+  seek(SCRIPT, 0, 0);
 
   # The first line in the script must be a comment that is used to identify
   # the set of tests as a whole.
@@ -3383,6 +3394,8 @@ foreach $test (@test_list)
     while (<SCRIPT>)
       {
       $lineno++;
+      # Could remove these variable settings because they are already
+      # set above, but doesn't hurt to leave them here.
       if (/^no_message_check/) { $message_skip = 1; next; }
       if (/^no_msglog_check/)  { $msglog_skip = 1; next; }
       if (/^no_stderr_check/)  { $stderr_skip = 1; next; }
-- 
cgit v1.2.3