@@ -284,7 +284,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):
@@ -326,9 +326,7 @@ def PerformComparison(expected, actual,
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
@@ -348,10 +346,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.' %
@@ -369,9 +364,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)