Patchwork [RFA,8/8] validate_failures.py: New directives @include, @remove.

login
register
mail settings
Submitter Doug Evans
Date Nov. 24, 2012, 11:02 p.m.
Message ID <yjt2txse61uz.fsf@ruffy2.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/201487/
State New
Headers show

Comments

Doug Evans - Nov. 24, 2012, 11:02 p.m.
Hi.
This eighth patch adds new directives to manifests: @include, @remove.
These are useful when needing to handle a multi-dimensional matrix of test
configurations, and not wanting to maintain the otherwise necessary duplication
across all of the axes.
[@remove should be used sparingly, but I've found it useful.]

Ok to check in?

2012-11-24  Doug Evans  <dje@google.com>

	* testsuite-management/validate_failures.py: Add support for @include, @remove
	directives in manifest files.
Diego Novillo - Nov. 25, 2012, 3:44 p.m.
On Sat, Nov 24, 2012 at 6:02 PM, Doug Evans <dje@google.com> wrote:

> 2012-11-24  Doug Evans  <dje@google.com>
>
>         * testsuite-management/validate_failures.py: Add support for @include, @remove
>         directives in manifest files.

OK.  Thanks for all the cleanups and features!


Diego.

Patch

--- validate_failures.py.manifest-subdir-name	2012-11-24 13:54:03.263761546 -0800
+++ validate_failures.py	2012-11-24 14:23:09.840487566 -0800
@@ -44,6 +44,14 @@  executed it will:
    b- Failures in the build not expected in the manifest.
 6- If all the build failures are expected in the manifest, it exits
    with exit code 0.  Otherwise, it exits with error code 1.
+
+Manifest files contain expected DejaGNU results that are otherwise
+treated as failures.
+They may also contain additional text:
+
+# This is a comment.  - self explanatory
+@include file         - the file is a path relative to the includer
+@remove result text   - result text is removed from the expected set
 """
 
 import datetime
@@ -192,11 +200,13 @@  def ValidBuildDirectory(builddir, target
   return True
 
 
+def IsComment(line):
+  """Return True if line is a comment."""
+  return line.startswith('#')
+
+
 def IsInterestingResult(line):
-  """Return True if the given line is one of the summary lines we care about."""
-  line = line.strip()
-  if line.startswith('#'):
-    return False
+  """Return True if line is one of the summary lines we care about."""
   if '|' in line:
     (_, line) = line.split('|', 1)
   line = line.strip()
@@ -206,6 +216,58 @@  def IsInterestingResult(line):
   return False
 
 
+def IsInclude(line):
+  """Return True if line is an include of another file."""
+  return line.startswith("@include ")
+
+
+def GetIncludeFile(line, includer):
+  """Extract the name of the include file from line."""
+  includer_dir = os.path.dirname(includer)
+  include_file = line[len("@include "):]
+  return os.path.join(includer_dir, include_file.strip())
+
+
+def IsNegativeResult(line):
+  """Return True if line should be removed from the expected results."""
+  return line.startswith("@remove ")
+
+
+def GetNegativeResult(line):
+  """Extract the name of the negative result from line."""
+  line = line[len("@remove "):]
+  return line.strip()
+
+
+def ParseManifestWorker(result_set, manifest_path):
+  """Read manifest_path, adding the contents to result_set."""
+  if options.verbosity >= 1:
+    print 'Parsing manifest file %s.' % manifest_path
+  manifest_file = open(manifest_path)
+  for line in manifest_file:
+    line = line.strip()
+    if line == "":
+      pass
+    elif IsComment(line):
+      pass
+    elif IsNegativeResult(line):
+      result_set.remove(TestResult(GetNegativeResult(line)))
+    elif IsInclude(line):
+      ParseManifestWorker(result_set, GetIncludeFile(line, manifest_path))
+    elif IsInterestingResult(line):
+      result_set.add(TestResult(line))
+    else:
+      Error('Unrecognized line in manifest file: %s' % line)
+  manifest_file.close()
+
+
+def ParseManifest(manifest_path):
+  """Create a set of TestResult instances from the given manifest file."""
+  result_set = set()
+  ParseManifestWorker(result_set, manifest_path)
+  return result_set
+
+
 def ParseSummary(sum_fname):
   """Create a set of TestResult instances from the given summary file."""
   result_set = set()