Bug 826651 - Add XML output path to testvars so that it can be used when saving files related to the results. r=jgriffin
authorDave Hunt <dhunt@mozilla.com>
Sun, 06 Jan 2013 22:24:15 -0500
changeset 117893 2678933d28ea23f477c2004af6613ba3d4d034e2
parent 117892 870dca5f3fdcd0524c17741f4ac72f189ac7cf94
child 117894 29fd39e0dde66646b0688c87b82d44aed79ca1ed
push id24129
push useremorley@mozilla.com
push dateMon, 07 Jan 2013 16:11:21 +0000
treeherdermozilla-central@c4966e14e726 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs826651
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 826651 - Add XML output path to testvars so that it can be used when saving files related to the results. r=jgriffin
testing/marionette/client/marionette/runtests.py
--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -207,22 +207,22 @@ class MarionetteTestRunner(object):
         self.marionette = None
         self.logcat_dir = logcat_dir
         self.perfrequest = None
         self.xml_output = xml_output
         self.repeat = repeat
         self.perf = perf
         self.perfserv = perfserv
         self.gecko_path = gecko_path
-        self.testvars = None
+        self.testvars = {}
         self.tree = tree
         self.load_early = load_early
         self.device = device
 
-        if testvars is not None:
+        if testvars:
             if not os.path.exists(testvars):
                 raise Exception('--testvars file does not exist')
 
             import json
             with open(testvars) as f:
                 self.testvars = json.loads(f.read())
 
         # set up test handlers
@@ -236,16 +236,17 @@ class MarionetteTestRunner(object):
             self.logger.setLevel(logging.INFO)
             self.logger.addHandler(logging.StreamHandler())
 
         if self.logcat_dir:
             if not os.access(self.logcat_dir, os.F_OK):
                 os.mkdir(self.logcat_dir)
 
         # for XML output
+        self.testvars['xml_output'] = self.xml_output
         self.results = []
 
     def reset_test_stats(self):
         self.passed = 0
         self.failed = 0
         self.todo = 0
         self.failures = []
         self.perfrequest = None