From 34c59b71d1bbd7c3db5bdf09593210c48ed53de7 Mon Sep 17 00:00:00 2001
From: Jonathan Griffin <jgriffin@mozilla.com>
Date: Thu, 6 Dec 2012 18:57:56 -0800
Subject: [PATCH] Bug 818738 - Use resultfile correctly

---
 coversheet/cli.py     | 2 ++
 coversheet/pulse.py   | 1 +
 coversheet/subproc.py | 7 ++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/coversheet/cli.py b/coversheet/cli.py
index fbd5779..89b5753 100644
--- a/coversheet/cli.py
+++ b/coversheet/cli.py
@@ -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:
diff --git a/coversheet/pulse.py b/coversheet/pulse.py
index 556290b..8a56416 100644
--- a/coversheet/pulse.py
+++ b/coversheet/pulse.py
@@ -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()
diff --git a/coversheet/subproc.py b/coversheet/subproc.py
index c4a0f73..3e99860 100644
--- a/coversheet/subproc.py
+++ b/coversheet/subproc.py
@@ -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 ''],