Android-chromium layout tests failing with GPU related crash
authorpeter@chromium.org <peter@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Jul 2012 19:40:26 +0000 (19:40 +0000)
committerpeter@chromium.org <peter@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Jul 2012 19:40:26 +0000 (19:40 +0000)
https://bugs.webkit.org/show_bug.cgi?id=92126

Reviewed by Adam Barth.

Remove support for the "--enable-hardware-gpu" flag from run_webkit_tests,
as it's not being used by any port anymore, and neither is being passed
on to the test runner. Instead, append the flag directly to DRT for the
Chromium Android port, which does rely on this functionality.

The ChromiumAndroidUnitTest tests didn't catch this as the property was
set to True, but it's unable to detect whether they'll actually be used.
No occurrances of "--enable-hardware-gpu" exist in either Tools/Scripts/
or Tools/BuildSlaveSupport/, so nothing upstream seems to rely on the flag.

* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidPort.__init__):
* Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py:
(ChromiumAndroidPortTest.test_attributes):
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(parse_args):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@123507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py
Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py
Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

index 6648c40..7c7bd42 100644 (file)
@@ -1,3 +1,27 @@
+2012-07-24  Peter Beverloo  <peter@chromium.org>
+
+        Android-chromium layout tests failing with GPU related crash
+        https://bugs.webkit.org/show_bug.cgi?id=92126
+
+        Reviewed by Adam Barth.
+
+        Remove support for the "--enable-hardware-gpu" flag from run_webkit_tests,
+        as it's not being used by any port anymore, and neither is being passed
+        on to the test runner. Instead, append the flag directly to DRT for the
+        Chromium Android port, which does rely on this functionality.
+
+        The ChromiumAndroidUnitTest tests didn't catch this as the property was
+        set to True, but it's unable to detect whether they'll actually be used.
+        No occurrances of "--enable-hardware-gpu" exist in either Tools/Scripts/
+        or Tools/BuildSlaveSupport/, so nothing upstream seems to rely on the flag.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+        (ChromiumAndroidPort.__init__):
+        * Scripts/webkitpy/layout_tests/port/chromium_android_unittest.py:
+        (ChromiumAndroidPortTest.test_attributes):
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (parse_args):
+
 2012-07-24  Alexander Shalamov  <alexander.shalamov@intel.com>
 
         [WTR][EFL] Multiple mouse clicks are not emitted in EventSenderProxyEfl
index eb4dcec..5b48ff0 100644 (file)
@@ -161,7 +161,7 @@ class ChromiumAndroidPort(chromium.ChromiumPort):
         self._options.additional_drt_flag.append('--encode-binary')
 
         # The Chromium port for Android always uses the hardware GPU path.
-        self._options.enable_hardware_gpu = True
+        self._options.additional_drt_flag.append('--enable-hardware-gpu')
 
         # Shard ref tests so that they run together to avoid repeatedly driver restarts.
         self._options.shard_ref_tests = True
index 0e2801a..ce74805 100644 (file)
@@ -48,7 +48,6 @@ class ChromiumAndroidPortTest(chromium_port_testcase.ChromiumPortTestCase):
 
     def test_attributes(self):
         port = self.make_port()
-        self.assertTrue(port.get_option('enable_hardware_gpu'))
         self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-android'))
 
     def test_default_timeout_ms(self):
index 455a8c2..5eaf312 100755 (executable)
@@ -246,10 +246,6 @@ def parse_args(args=None):
             action="store_true",
             default=False,
             help="Use hardware accelerated painting of composited pages"),
-        optparse.make_option("--enable-hardware-gpu",
-            action="store_true",
-            default=False,
-            help="Run graphics tests on real GPU hardware vs software"),
         optparse.make_option("--per-tile-painting",
             action="store_true",
             help="Use per-tile painting of composited pages"),