From d8364a0851339bd27a949204712d09a5967e93e2 Mon Sep 17 00:00:00 2001 From: dnovillo Date: Thu, 19 Jul 2012 14:35:18 +0000 Subject: Fix --produce_manifest flag in validate_failures.py. When I added the functionality to use other summary files for reporting, I broke the generation of manifests. When sum files are passed on, we need to use the list. Otherwise, we need to find summary files in the build directory. This patch factors out that logic into a new function and calls it from both the reporting and generation routines. Committed to trunk. * testsuite-management/validate_failures.py (CollectSumFiles): Rename from GetSumFiles. (GetSumFiles): Factor out of CheckExpectedResults. (CheckExpectedResults): Call it. (ProduceManifest): Call it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189662 138bc75d-0d04-0410-961f-82ee72b054a4 --- contrib/testsuite-management/validate_failures.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'contrib/testsuite-management') diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py index b2c52fc007b..c48e4c3de70 100755 --- a/contrib/testsuite-management/validate_failures.py +++ b/contrib/testsuite-management/validate_failures.py @@ -195,7 +195,7 @@ def GetManifest(manifest_name): return set() -def GetSumFiles(builddir): +def CollectSumFiles(builddir): sum_files = [] for root, dirs, files in os.walk(builddir): if '.svn' in dirs: @@ -255,6 +255,16 @@ def PrintSummary(msg, summary): print result +def GetSumFiles(results, build_dir): + if not results: + print 'Getting actual results from build' + sum_files = CollectSumFiles(build_dir) + else: + print 'Getting actual results from user-provided results' + sum_files = results.split() + return sum_files + + def CheckExpectedResults(options): if not options.manifest: (srcdir, target, valid_build) = GetBuildData(options) @@ -268,13 +278,7 @@ def CheckExpectedResults(options): print 'Manifest: %s' % manifest_name manifest = GetManifest(manifest_name) - - if not options.results: - print 'Getting actual results from build' - sum_files = GetSumFiles(options.build_dir) - else: - print 'Getting actual results from user-provided results' - sum_files = options.results.split() + sum_files = GetSumFiles(options.results, options.build_dir) actual = GetResults(sum_files) if options.verbosity >= 1: @@ -311,7 +315,8 @@ def ProduceManifest(options): Error('Manifest file %s already exists.\nUse --force to overwrite.' % manifest_name) - actual = GetResults(options.build_dir) + sum_files = GetSumFiles(options.results, options.build_dir) + actual = GetResults(sum_files) with open(manifest_name, 'w') as manifest_file: for result in sorted(actual): print result -- cgit v1.2.1