Commit cd1d95bd by Doug Evans Committed by Doug Evans

validate_failures.py: Rename variable manifest_name to manifest_path everywhere.

	* testsuite-management/validate_failures.py: Rename variable
	manifest_name to manifest_path everywhere.

From-SVN: r193965
parent bc7d0e90
2012-11-29 Doug Evans <dje@google.com> 2012-11-29 Doug Evans <dje@google.com>
* testsuite-management/validate_failures.py: Rename variable
manifest_name to manifest_path everywhere.
* testsuite-management/validate_failures.py (CompareBuilds): Pass * testsuite-management/validate_failures.py (CompareBuilds): Pass
options.results to GetSumFiles for clean build. options.results to GetSumFiles for clean build.
......
...@@ -220,7 +220,7 @@ def ParseSummary(sum_fname): ...@@ -220,7 +220,7 @@ def ParseSummary(sum_fname):
return result_set return result_set
def GetManifest(manifest_name): def GetManifest(manifest_path):
"""Build a set of expected failures from the manifest file. """Build a set of expected failures from the manifest file.
Each entry in the manifest file should have the format understood Each entry in the manifest file should have the format understood
...@@ -228,8 +228,8 @@ def GetManifest(manifest_name): ...@@ -228,8 +228,8 @@ def GetManifest(manifest_name):
If no manifest file exists for this target, it returns an empty set. If no manifest file exists for this target, it returns an empty set.
""" """
if os.path.exists(manifest_name): if os.path.exists(manifest_path):
return ParseSummary(manifest_name) return ParseManifest(manifest_path)
else: else:
return set() return set()
...@@ -334,14 +334,14 @@ def CheckExpectedResults(options): ...@@ -334,14 +334,14 @@ def CheckExpectedResults(options):
(srcdir, target, valid_build) = GetBuildData(options) (srcdir, target, valid_build) = GetBuildData(options)
if not valid_build: if not valid_build:
return False return False
manifest_name = _MANIFEST_PATH_PATTERN % (srcdir, target) manifest_path = _MANIFEST_PATH_PATTERN % (srcdir, target)
else: else:
manifest_name = options.manifest manifest_path = options.manifest
if not os.path.exists(manifest_name): if not os.path.exists(manifest_path):
Error('Manifest file %s does not exist.' % manifest_name) Error('Manifest file %s does not exist.' % manifest_path)
print 'Manifest: %s' % manifest_name print 'Manifest: %s' % manifest_path
manifest = GetManifest(manifest_name) manifest = GetManifest(manifest_path)
sum_files = GetSumFiles(options.results, options.build_dir) sum_files = GetSumFiles(options.results, options.build_dir)
actual = GetResults(sum_files) actual = GetResults(sum_files)
...@@ -357,14 +357,14 @@ def ProduceManifest(options): ...@@ -357,14 +357,14 @@ def ProduceManifest(options):
if not valid_build: if not valid_build:
return False return False
manifest_name = _MANIFEST_PATH_PATTERN % (srcdir, target) manifest_path = _MANIFEST_PATH_PATTERN % (srcdir, target)
if os.path.exists(manifest_name) and not options.force: if os.path.exists(manifest_path) and not options.force:
Error('Manifest file %s already exists.\nUse --force to overwrite.' % Error('Manifest file %s already exists.\nUse --force to overwrite.' %
manifest_name) manifest_path)
sum_files = GetSumFiles(options.results, options.build_dir) sum_files = GetSumFiles(options.results, options.build_dir)
actual = GetResults(sum_files) actual = GetResults(sum_files)
manifest_file = open(manifest_name, 'w') manifest_file = open(manifest_path, 'w')
for result in sorted(actual): for result in sorted(actual):
print result print result
manifest_file.write('%s\n' % result) manifest_file.write('%s\n' % result)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment