Bug 611007 - update maemkit to optionally run a complete reftest.list file instead of chunking by default. r=aki
authorJoel Maher <jmaher@mozilla.com>
Fri, 12 Nov 2010 13:34:48 -0500
changeset 20 ba8623e3b1812ebed2c683f08fe527dd54b3fdb2
parent 19 9c773fe1d3f2bcbdf95a7706db8d182792ca6ff3
child 21 b793afeb95d070c19539f2b9c4dc77ca3155ddbd
push id21
push userjmaher@mozilla.com
push dateFri, 12 Nov 2010 18:35:20 +0000
reviewersaki
bugs611007
Bug 611007 - update maemkit to optionally run a complete reftest.list file instead of chunking by default. r=aki
maemkit.cfg
refdriver.py
--- a/maemkit.cfg
+++ b/maemkit.cfg
@@ -52,15 +52,17 @@ log-file = /builds/fennec/log_reftest.tx
 verbose = 1
 
 [crashtest]
 testroot = /builds/fennec/reftest/tests
 utility-path = /builds/fennec/reftest
 manifest = /builds/fennec/reftest/tests/testing/crashtest/crashtests.list
 log-file = /builds/fennec/log_crashtest.txt
 verbose = 1
+no-pieces = true
 
 [xpcshell]
 testroot = /builds/fennec/xpcshell/tests
 utility-path = /builds/fennec/xpcshell
 manifest = /builds/fennec/xpcshell/tests/all-test-dirs.list
 log-file = /builds/fennec/log_xpcshell.txt
 verbose = 1
+
--- a/refdriver.py
+++ b/refdriver.py
@@ -21,18 +21,16 @@ class RefDriver(maemkit.MaemKit):
     #backup manifest, use backup incase we are running again
     self.move(manifest + ".bak", manifest + "")
     self.move(manifest, manifest + ".bak")
 
     fHandle = open(manifest + ".bak", "r")
     lines = fHandle.readlines()
     fHandle.close()
 
-    self.addDir(rootdir)
-
     #rewrite manifest with include lines # out
     fHandle = open(manifest, "w")
     for line in lines:
       test = p.match(line)
       if (test):
         self.addDir(os.path.normpath(os.path.join(rootdir, test.group(1))))
         line = "#" + line
       fHandle.write(line)
@@ -127,17 +125,20 @@ class Crashtest(RefDriver):
   def __init__(self, mkit):
     self.dirtype = mkit.dirtype
     self.addOptions(mkit.config_options["crashtest"])
 
   def addOptions(self, options):
     RefDriver.addOptions(self, options)
 
   def getTests(self):
-    RefDriver.findDirs(self, os.path.normpath(self.options["manifest"]))
+    if (RefDriver.options["no-pieces"] == "true"):
+      self.addDir(self.options["manifest"])
+    else:
+      RefDriver.findDirs(self, os.path.normpath(self.options["manifest"]))
 
   def prepTests(self):
     RefDriver.prepTests(self)
 
   def runTests(self):
     RefDriver.runTests(self)
 
   def parseLogs(self):