Changeset 170426 in webkit

Timestamp:

Jun 25, 2014, 5:25:20 AM (12 years ago)

Author:

Michał Pakuła vel Rutka

Message:

[EFL] Remove WebKit1 related code from scripts
​https://bugs.webkit.org/show_bug.cgi?id=134195

Reviewed by Laszlo Gombos.

After removing WebKit1 from EFL port, still there is some code left related to DumpRenderTree,
EWebLauncher. Also running layout tests does not require adding -2/--webkit-test-runner switch.

• Scripts/run-launcher: MiniBrowser now runs as default without -2 switch.
• Scripts/webkitdirs.pm:

(builtDylibPathForName): Remove reference to libewebkit.so

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(_set_up_derived_options): Script runs WKTR by default.

• Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner.init): Ditto.

• Scripts/webkitpy/port/efl.py:

(EflPort._search_paths): Remove efl-wk2 from baseline search path.
(EflPort.show_results_html_file): Run MiniBrowser as result viewer.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-launcher (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner.py (modified) (1 diff)
• Scripts/webkitpy/port/efl.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-06-25  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
+
+        [EFL] Remove WebKit1 related code from scripts
+        https://bugs.webkit.org/show_bug.cgi?id=134195
+
+        Reviewed by Laszlo Gombos.
+
+        After removing WebKit1 from EFL port, still there is some code left related to DumpRenderTree, 
+        EWebLauncher. Also running layout tests does not require adding -2/--webkit-test-runner switch.
+
+        * Scripts/run-launcher: MiniBrowser now runs as default without -2 switch.
+        * Scripts/webkitdirs.pm:
+        (builtDylibPathForName): Remove reference to libewebkit.so
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (_set_up_derived_options): Script runs WKTR by default.
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner.__init__): Ditto.
+        * Scripts/webkitpy/port/efl.py:
+        (EflPort._search_paths): Remove efl-wk2 from baseline search path.
+        (EflPort.show_results_html_file): Run MiniBrowser as result viewer.
+
 2014-06-25  Laszlo Gombos  <l.gombos@samsung.com>
 

trunk/Tools/Scripts/run-launcher

@@ -46 +46 @@
 
 # Set paths according to the build system used
-if (isGtk()) {
+if (isGtk() || isEfl()) {
     $launcherPath = catdir($productDir, "bin", "MiniBrowser");
-} elsif (isEfl()) {
-    if (isWK2()) {
-        $launcherPath = catdir($productDir, "bin", "MiniBrowser");
-    } else {
-        $launcherPath = catdir($productDir, "bin", "EWebLauncher");
-    }
 }
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -830 +830 @@
     }
     if (isEfl()) {
-        if (isWK2()) {
-            return "$configurationProductDir/lib/libewebkit2.so";
-        }
-        return "$configurationProductDir/lib/libewebkit.so";
+        return "$configurationProductDir/lib/libewebkit2.so";
     }
     if (isWinCE()) {

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -383 +383 @@
         options.verbose = True
 
-    # The GTK+ port only support WebKit2 so it always uses WKTR.
-    if options.platform == "gtk":
+    # The GTK+ and EFL ports only support WebKit2 so they always use WKTR.
+    if options.platform == "gtk" or options.platform == "efl":
         options.webkit_test_runner = True
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@ -67 +67 @@
             self._port = self._host.port_factory.get(self._options.platform, self._options)
 
-        # The GTK+ port only supports WebKit2, so it always uses WKTR.
-        if self._port.name().startswith("gtk"):
+        # The GTK+ and EFL ports only supports WebKit2, so they always use WKTR.
+        if self._port.name().startswith("gtk") or self._port.name().startswith("efl"):
             self._options.webkit_test_runner = True
 

trunk/Tools/Scripts/webkitpy/port/efl.py

@@ -111 +111 @@
     def _search_paths(self):
         search_paths = []
-        if self.get_option('webkit_test_runner'):
-            search_paths.append(self.port_name + '-wk2')
-            search_paths.append('wk2')
-        else:
-            search_paths.append(self.port_name + '-wk1')
+        search_paths.append('wk2')
         search_paths.append(self.port_name)
         return search_paths
@@ -130 +126 @@
         # or teach run-launcher how to call run-safari and move this down to WebKitPort.
         run_launcher_args = ["file://%s" % results_filename]
-        if self.get_option('webkit_test_runner'):
-            run_launcher_args.append('-2')
         # FIXME: old-run-webkit-tests also added ["-graphicssystem", "raster", "-style", "windows"]
         # FIXME: old-run-webkit-tests converted results_filename path for cygwin.