Bug 637660 - add sandbox.Android, and skip a few crashtests so we can run green on Android. r=dbaron, a=tests
authorJoel Maher <jmaher@mozilla.com>
Fri, 11 Mar 2011 09:15:33 -0500
changeset 63388 2269cb1136f91fd8828c2061987d8a18296ad2e4
parent 63387 3570861040e98ed5331fdac7a8aa8d8b489eb84d
child 63389 1512e152385ef9eee4e4e6ed68b7c969631bf422
push id19184
push userjmaher@mozilla.com
push dateFri, 11 Mar 2011 14:19:52 +0000
treeherdermozilla-central@4512b571e48e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron, tests
bugs637660
milestone2.0b13pre
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 637660 - add sandbox.Android, and skip a few crashtests so we can run green on Android. r=dbaron, a=tests
content/media/test/crashtests/crashtests.list
layout/generic/crashtests/crashtests.list
layout/tools/reftest/reftest.js
layout/tools/reftest/remotereftest.py
layout/tools/reftest/runreftest.py
--- a/content/media/test/crashtests/crashtests.list
+++ b/content/media/test/crashtests/crashtests.list
@@ -1,10 +1,10 @@
 load 459439-1.html
 load 466607-1.html
 load 466945-1.html
 load 468763-1.html
 load 474744-1.html
 HTTP load 481136-1.html # needs to be HTTP to recognize the ogg as an audio file?
 load 493915-1.html
-load 495794-1.html
+skip-if(Android) load 495794-1.html
 load 492286-1.xhtml
 load 576612-1.html
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -277,17 +277,17 @@ load 473894-1.html
 load 476241-1.html
 load 477731-1.html
 load 477928.html
 load 478131-1.html
 load 478170-1.html
 load 478185-1.html
 asserts(1) load 479938-1.html # Bug 575011
 load 480345-1.html
-load 481921.html
+skip-if(Android) load 481921.html
 load 489462-1.html
 load 489480-1.xhtml
 load 493111-1.html
 load 493118-1.html
 load 494300-1.xul
 load 494332-1.html
 load 495875-1.html
 load 495875-2.html
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -396,16 +396,17 @@ function BuildConditionSandbox(aURL) {
     }
 
     if (gWindowUtils && gWindowUtils.layerManagerType != "Basic")
       sandbox.layersGPUAccelerated = true;
     else
       sandbox.layersGPUAccelerated = false;
  
     // Shortcuts for widget toolkits.
+    sandbox.Android = xr.OS == "Android";
     sandbox.cocoaWidget = xr.widgetToolkit == "cocoa";
     sandbox.gtk2Widget = xr.widgetToolkit == "gtk2";
     sandbox.qtWidget = xr.widgetToolkit == "qt";
     sandbox.winWidget = xr.widgetToolkit == "windows";
 
     var hh = CC[NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX + "http"].
                  getService(CI.nsIHttpProtocolHandler);
     sandbox.http = { __exposedProps__: {} };
--- a/layout/tools/reftest/remotereftest.py
+++ b/layout/tools/reftest/remotereftest.py
@@ -297,17 +297,17 @@ class RemoteReftest(RefTest):
         self.server.ensureReady(self.SERVER_STARTUP_TIMEOUT)
         options.xrePath = remoteXrePath
         options.utilityPath = remoteUtilityPath
          
     def stopWebServer(self, options):
         self.server.stop()
 
     def createReftestProfile(self, options, profileDir):
-        RefTest.createReftestProfile(self, options, profileDir)
+        RefTest.createReftestProfile(self, options, profileDir, server=options.remoteWebServer)
 
         if (self._devicemanager.pushDir(profileDir, options.remoteProfile) == None):
             raise devicemanager.FileError("Failed to copy profiledir to device")
 
     def copyExtraFilesToProfile(self, options, profileDir):
         RefTest.copyExtraFilesToProfile(self, options, profileDir)
         if (self._devicemanager.pushDir(profileDir, options.remoteProfile) == None):
             raise devicemanager.FileError("Failed to copy extra files to device") 
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -60,21 +60,21 @@ class RefTest(object):
   def getFullPath(self, path):
     "Get an absolute path relative to self.oldcwd."
     return os.path.normpath(os.path.join(self.oldcwd, os.path.expanduser(path)))
 
   def getManifestPath(self, path):
     "Get the path of the manifest, and for remote testing this function is subclassed to point to remote manifest"
     return self.getFullPath(path)
 
-  def createReftestProfile(self, options, profileDir):
+  def createReftestProfile(self, options, profileDir, server='localhost'):
     "Sets up a profile for reftest."
 
     self.automation.setupPermissionsDatabase(profileDir,
-      {'allowXULXBL': [('localhost', True), ('<file>', True)]})
+      {'allowXULXBL': [(server, True), ('<file>', True)]})
 
     # Set preferences for communication between our command line arguments
     # and the reftest harness.  Preferences that are required for reftest
     # to work should instead be set in reftest-cmdline.js .
     prefsFile = open(os.path.join(profileDir, "user.js"), "w")
     prefsFile.write('user_pref("reftest.timeout", %d);\n' % (options.timeout * 1000))
 
     if options.totalChunks != None: