merging default -> production-0.8

--HG-- branch : production-0.8
mozilla-releng · Dec 12, 2012 · 9da2fa1 · 9da2fa1
2 parents 69f24ac + 625cb58
commit 9da2fa1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/process/factory.py b/process/factory.py
@@ -4861,7 +4861,7 @@ def addRunTestSteps(self):
                   symbols_path=symbols_path,
                   maxTime=120*60, # Two Hours
                  ))
-            elif suite in ('reftest', 'reftest-ipc', 'reftest-d2d', 'crashtest', \
+            elif suite in ('reftest', 'reftestsmall' 'reftest-ipc', 'reftest-d2d', 'crashtest', \
                            'crashtest-ipc', 'direct3D', 'opengl', 'opengl-no-accel', \
                            'reftest-no-d2d-d3d'):
                 if suite in ('direct3D', 'opengl'):
@@ -5131,6 +5131,13 @@ def addRunTestSteps(self):
                 haltOnFailure=True)
             )
             if name.startswith('mochitest'):
+                # XXX Hack for Bug 811444
+                # Slow down tests for panda boards
+                if 'panda' in self.platform:
+                    slowTests = True
+                else:
+                    slowTests = False
+
                 self.addStep(UnpackTest(
                  filename=WithProperties('../%(tests_filename)s'),
                  testtype='mochitest',
@@ -5148,6 +5155,7 @@ def addRunTestSteps(self):
                          variant=variant,
                          symbols_path=symbols_path,
                          testPath=tp,
+                         slowTests=slowTests,
                          workdir='build/tests',
                          timeout=2400,
                          app=self.remoteProcessName,
@@ -5162,6 +5170,7 @@ def addRunTestSteps(self):
                      variant=variant,
                      symbols_path=symbols_path,
                      testManifest=suite.get('testManifest', None),
+                     slowTests=slowTests,
                      workdir='build/tests',
                      timeout=2400,
                      app=self.remoteProcessName,
@@ -5174,6 +5183,7 @@ def addRunTestSteps(self):
             elif name.startswith('reftest') or name == 'crashtest':
                 totalChunks = suite.get('totalChunks', None)
                 thisChunk = suite.get('thisChunk', None)
+                extra_args = suite.get('extra_args', None)
                 # Unpack the tests
                 self.addStep(UnpackTest(
                  filename=WithProperties('../%(tests_filename)s'),
@@ -5186,6 +5196,7 @@ def addRunTestSteps(self):
                  symbols_path=symbols_path,
                  totalChunks=totalChunks,
                  thisChunk=thisChunk,
+                 extra_args=extra_args,
                  workdir='build/tests',
                  timeout=2400,
                  app=self.remoteProcessName,

diff --git a/steps/unittest.py b/steps/unittest.py
@@ -316,7 +316,7 @@ def getSuiteOptions(self, suite):
         elif suite == 'crashtest-ipc':
             return ['--setpref=browser.tabs.remote=true',
                     'reftest/tests/testing/crashtest/crashtests.list']
-        elif suite in ('reftest', 'direct3D', 'opengl'):
+        elif suite in ('reftest', 'direct3D', 'opengl', 'reftestsmall'):
             return ['reftest/tests/layout/reftests/reftest.list']
         elif suite in ('reftest-ipc'):
             # See bug 637858 for why we are doing a subset of all reftests
@@ -587,7 +587,7 @@ def __init__(self, variant, symbols_path=None, testPath=None,
                  xrePath='../hostutils/xre', testManifest=None,
                  utilityPath='../hostutils/bin', certificatePath='certs',
                  app='org.mozilla.fennec', consoleLevel='INFO', 
-                 totalChunks=None, thisChunk=None, **kwargs):
+                 totalChunks=None, thisChunk=None, slowTests=False, **kwargs):
         self.super_class = ShellCommandReportTimeout
         ShellCommandReportTimeout.__init__(self, **kwargs)
 
@@ -598,7 +598,7 @@ def __init__(self, variant, symbols_path=None, testPath=None,
                                  testPath=testPath, xrePath=xrePath,
                                  testManifest=testManifest, utilityPath=utilityPath,
                                  certificatePath=certificatePath, app=app,
-                                 consoleLevel=consoleLevel,
+                                 consoleLevel=consoleLevel, slowTests=slowTests,
                                  totalChunks=totalChunks, thisChunk=thisChunk)
 
         self.name = 'mochitest-%s' % variant
@@ -620,6 +620,8 @@ def __init__(self, variant, symbols_path=None, testPath=None,
             self.command.extend(['--run-only-tests', testManifest])
         if symbols_path:
             self.command.append(WithProperties("--symbols-path=%s" % symbols_path))
+        if slowTests:
+            self.command.append(['--run-slower'])
         self.command.extend(self.getChunkOptions(totalChunks, thisChunk))
 
 
@@ -640,14 +642,14 @@ def evaluateCommand(self, cmd):
 class RemoteReftestStep(ReftestMixin, ChunkingMixin, ShellCommandReportTimeout):
     def __init__(self, suite, symbols_path=None, xrePath='../hostutils/xre',
                  utilityPath='../hostutils/bin', app='org.mozilla.fennec',
-                 totalChunks=None, thisChunk=None, cmdOptions=None, **kwargs):
+                 totalChunks=None, thisChunk=None, cmdOptions=None, extra_args=None, **kwargs):
         self.super_class = ShellCommandReportTimeout
         ShellCommandReportTimeout.__init__(self, **kwargs)
         self.addFactoryArguments(suite=suite, xrePath=xrePath,
                                  symbols_path=symbols_path,
                                  utilityPath=utilityPath, app=app,
                                  totalChunks=totalChunks, thisChunk=thisChunk,
-                                 cmdOptions=cmdOptions)
+                                 cmdOptions=cmdOptions, extra_args=extra_args)
 
         self.name = suite
         if totalChunks:
@@ -664,6 +666,8 @@ def __init__(self, suite, symbols_path=None, xrePath='../hostutils/xre',
                        ]
         if suite == 'jsreftest' or suite == 'crashtest':
             self.command.append('--ignore-window-size')
+        if extra_args:
+           self.command.append(extra_args)
 
         if cmdOptions:
           self.command.extend(cmdOptions)