summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authordevans <devans@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-29 21:40:16 +0000
committerdevans <devans@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-29 21:40:16 +0000
commitbf330a11be325d339866f3c2f26c2482859117c4 (patch)
treec06c87cadffb4df43939f00260f2b3198af9f99e /contrib
parent53632709e6233ce57d9ee5bf10651402a232f798 (diff)
downloadgcc-bf330a11be325d339866f3c2f26c2482859117c4.tar.gz
* testsuite-management/validate_failures.py: Remove pass/fail
indicator from result of GetBuildData. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193968 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog3
-rwxr-xr-xcontrib/testsuite-management/validate_failures.py15
2 files changed, 7 insertions, 11 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index c5b77e47976..6bceead2be4 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,5 +1,8 @@
2012-11-29 Doug Evans <dje@google.com>
+ * testsuite-management/validate_failures.py: Remove pass/fail
+ indicator from result of GetBuildData.
+
* testsuite-management/validate_failures.py: Store options in global
variable _OPTIONS.
diff --git a/contrib/testsuite-management/validate_failures.py b/contrib/testsuite-management/validate_failures.py
index 24b61aa132f..7844cb03fb1 100755
--- a/contrib/testsuite-management/validate_failures.py
+++ b/contrib/testsuite-management/validate_failures.py
@@ -292,7 +292,7 @@ def GetBuildData():
_OPTIONS.build_dir)
print 'Source directory: %s' % srcdir
print 'Build target: %s' % target
- return srcdir, target, True
+ return srcdir, target
def PrintSummary(msg, summary):
@@ -334,9 +334,7 @@ def PerformComparison(expected, actual, ignore_missing_failures):
def CheckExpectedResults():
if not _OPTIONS.manifest:
- (srcdir, target, valid_build) = GetBuildData()
- if not valid_build:
- return False
+ (srcdir, target) = GetBuildData()
manifest_path = _MANIFEST_PATH_PATTERN % (srcdir, target)
else:
manifest_path = _OPTIONS.manifest
@@ -356,10 +354,7 @@ def CheckExpectedResults():
def ProduceManifest():
- (srcdir, target, valid_build) = GetBuildData()
- if not valid_build:
- return False
-
+ (srcdir, target) = GetBuildData()
manifest_path = _MANIFEST_PATH_PATTERN % (srcdir, target)
if os.path.exists(manifest_path) and not _OPTIONS.force:
Error('Manifest file %s already exists.\nUse --force to overwrite.' %
@@ -377,9 +372,7 @@ def ProduceManifest():
def CompareBuilds():
- (srcdir, target, valid_build) = GetBuildData()
- if not valid_build:
- return False
+ (srcdir, target) = GetBuildData()
sum_files = GetSumFiles(_OPTIONS.results, _OPTIONS.build_dir)
actual = GetResults(sum_files)