Diff
Modified: trunk/Tools/ChangeLog (98156 => 98157)
--- trunk/Tools/ChangeLog 2011-10-21 21:43:39 UTC (rev 98156)
+++ trunk/Tools/ChangeLog 2011-10-21 21:59:58 UTC (rev 98157)
@@ -1,3 +1,17 @@
+2011-10-21 Leandro Pereira <[email protected]>
+
+ webkitpy: Teach NRWT about the EFL port
+ https://bugs.webkit.org/show_bug.cgi?id=70637
+
+ Allows using ``efl'' as a platform when executing NRWT.
+
+ Reviewed by Eric Seidel.
+
+ * Scripts/webkitpy/layout_tests/port/efl.py: Added.
+ * Scripts/webkitpy/layout_tests/port/efl_unittest.py: Added.
+ * Scripts/webkitpy/layout_tests/port/factory.py: Adjust factory to make EflPort objects
+ when using PortFactory.get(port_name='efl').
+
2011-10-21 Devdatta Deshpande <[email protected]>
[Gtk] mousemove event always has metaKey == true
Added: trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py (0 => 98157)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py 2011-10-21 21:59:58 UTC (rev 98157)
@@ -0,0 +1,80 @@
+# Copyright (C) 2011 ProFUSION Embedded Systems. All rights reserved.
+# Copyright (C) 2011 Samsung Electronics. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""WebKit Efl implementation of the Port interface."""
+
+import logging
+import signal
+import subprocess
+
+from webkitpy.layout_tests.models.test_configuration import TestConfiguration
+from webkitpy.layout_tests.port import base, builders, server_process, webkit
+
+
+_log = logging.getLogger(__name__)
+
+
+class EflPort(webkit.WebKitPort):
+ port_name = "efl"
+
+ def __init__(self, **kwargs):
+ webkit.WebKitPort.__init__(self, **kwargs)
+ self._version = self.port_name
+
+ def _port_flag_for_scripts(self):
+ return "--efl"
+
+ def setup_environ_for_server(self, server_name=None):
+ return webkit.WebKitPort.setup_environ_for_server(self, server_name)
+
+ def _generate_all_test_configurations(self):
+ return [TestConfiguration(version=self._version, architecture='x86', build_type=build_type, graphics_type='cpu') for build_type in self.ALL_BUILD_TYPES]
+
+ def _path_to_driver(self):
+ return self._build_path('Programs', self.driver_name())
+
+ def _path_to_image_diff(self):
+ return self._build_path('Programs', 'ImageDiff')
+
+ def check_build(self, needs_http):
+ return self._check_driver()
+
+ def _path_to_webcore_library(self):
+ static_path = self._build_path('WebCore', 'libwebcore_efl.a')
+ dyn_path = self._build_path('WebCore', 'libwebcore_efl.so')
+
+ return static_path if self._filesystem.exists(static_path) else dyn_path
+
+ def _runtime_feature_list(self):
+ return None
+
+ def show_results_html_file(self, results_filename):
+ # FIXME: We should find a way to share this implmentation with Gtk,
+ # or teach run-launcher how to call run-safari and move this down to WebKitPort.
+ run_launcher_args = ["file://%s" % results_filename]
+ # FIXME: old-run-webkit-tests also added ["-graphicssystem", "raster", "-style", "windows"]
+ # FIXME: old-run-webkit-tests converted results_filename path for cygwin.
+ self._run_script("run-launcher", run_launcher_args)
Added: trunk/Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py (0 => 98157)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py 2011-10-21 21:59:58 UTC (rev 98157)
@@ -0,0 +1,43 @@
+# Copyright (C) 2011 ProFUSION Embedded Systems. All rights reserved.
+# Copyright (C) 2011 Samsung Electronics. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import unittest
+
+from webkitpy.common.system.outputcapture import OutputCapture
+from webkitpy.layout_tests.port.efl import EflPort
+from webkitpy.layout_tests.port import port_testcase
+from webkitpy.tool.mocktool import MockExecutive
+
+
+class EflPortTest(port_testcase.PortTestCase):
+ def port_maker(self, platform):
+ return EflPort
+
+ def test_show_results_html_file(self):
+ port = self.make_port()
+ port._executive = MockExecutive(should_log=True)
+ expected_stderr = "MOCK run_command: ['Tools/Scripts/run-launcher', '--release', '--efl', 'file://test.html'], cwd=/mock-checkout\n"
+ OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_stderr=expected_stderr)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py (98156 => 98157)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2011-10-21 21:43:39 UTC (rev 98156)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2011-10-21 21:59:58 UTC (rev 98157)
@@ -106,6 +106,9 @@
elif port_to_use.startswith('google-chrome'):
import google_chrome
maker = google_chrome.GetGoogleChromePort
+ elif port_to_use.startswith('efl'):
+ import efl
+ maker = efl.EflPort
else:
raise NotImplementedError('unsupported port: %s' % port_to_use)
