Bug 818738 - Use resultfile correctly

This commit is contained in:
Jonathan Griffin 2012-12-06 18:57:56 -08:00
Родитель 30622b9579
Коммит 34c59b71d1
3 изменённых файлов: 9 добавлений и 1 удалений

Просмотреть файл

@ -117,6 +117,8 @@ def main():
f.close()
config = json.loads(configcontent)
options.resultfile = os.path.abspath(options.resultfile)
if options.binary is None:
while True:
try:

Просмотреть файл

@ -100,6 +100,7 @@ class TPSPulseMonitor(PulseBuildMonitor):
logfile=self.logfile,
config=self.config,
mobile=self.mobile,
resultfile=self.resultfile,
ignore_unused_engines=self.ignore_unused_engines)
mysub.get_buildAndTests()

Просмотреть файл

@ -50,7 +50,8 @@ from mozregression.utils import download_url, get_platform
class TPSSubproc():
def __init__(self, builddata=None, emailresults=False,
testfile=None, logfile=None, config=None, autolog=False,
mobile=False, ignore_unused_engines=False):
mobile=False, ignore_unused_engines=False,
resultfile=None):
assert(builddata)
assert(config)
@ -62,6 +63,7 @@ class TPSSubproc():
self.config = config
self.autolog = autolog
self.mobile = mobile
self.resultfile = resultfile
self.ignore_unused_engines = ignore_unused_engines
def download_build(self, installdir='downloadedbuild',
@ -172,6 +174,7 @@ class TPSSubproc():
self.run_process([python_path, tps_cli,
"--binary", self.binary,
"--testfile", self.testfile,
"--resultfile", self.resultfile,
"--logfile", self.logfile,
"--configfile", self.config,
"--mobile" if self.mobile else '',
@ -182,6 +185,7 @@ class TPSSubproc():
self.run_process([python_path, tps_cli,
"--binary", self.binary,
"--testfile", self.testfile,
"--resultfile", self.resultfile,
"--logfile", self.logfile,
"--configfile", self.config,
"--mobile",
@ -204,6 +208,7 @@ class TPSSubproc():
self.run_process([python_path, tps_cli,
"--binary", self.binary,
"--testfile", self.testfile,
"--resultfile", self.resultfile,
"--logfile", self.logfile,
"--configfile", stageconfig,
"--ignore_unused_engines" if self.ignore_unused_engines else ''],