Diff
Modified: trunk/Tools/ChangeLog (212513 => 212514)
--- trunk/Tools/ChangeLog 2017-02-17 01:28:00 UTC (rev 212513)
+++ trunk/Tools/ChangeLog 2017-02-17 01:30:41 UTC (rev 212514)
@@ -1,3 +1,53 @@
+2017-02-16 Alex Christensen <[email protected]>
+
+ Remove EFL-specific files in Tools.
+
+ Rubber-stamped by Anders Carlsson.
+
+ * ImageDiff/efl: Removed.
+ * ImageDiff/efl/ImageDiff.cpp: Removed.
+ * MiniBrowser/efl: Removed.
+ * MiniBrowser/efl/CMakeLists.txt: Removed.
+ * MiniBrowser/efl/main.c: Removed.
+ * Scripts/run-efl-tests: Removed.
+ * Scripts/update-webkitefl-libs: Removed.
+ * Scripts/webkitpy/port/efl.py: Removed.
+ * Scripts/webkitpy/port/efl_unittest.py: Removed.
+ * TestWebKitAPI/Tests/WebKit2/efl: Removed.
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp: Removed.
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks_Bundle.cpp: Removed.
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewScrollTo.cpp: Removed.
+ * TestWebKitAPI/Tests/WebKit2/efl/scrollTo.html: Removed.
+ * TestWebKitAPI/efl: Removed.
+ * TestWebKitAPI/efl/InjectedBundleController.cpp: Removed.
+ * TestWebKitAPI/efl/PlatformUtilities.cpp: Removed.
+ * TestWebKitAPI/efl/PlatformWebView.cpp: Removed.
+ * TestWebKitAPI/efl/main.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/efl: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/ActivateFontsEfl.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/FontManagement.h: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/InjectedBundleEfl.cpp: Removed.
+ * WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp: Removed.
+ * WebKitTestRunner/efl: Removed.
+ * WebKitTestRunner/efl/EventSenderProxyEfl.cpp: Removed.
+ * WebKitTestRunner/efl/PlatformWebViewEfl.cpp: Removed.
+ * WebKitTestRunner/efl/TestControllerEfl.cpp: Removed.
+ * WebKitTestRunner/efl/main.cpp: Removed.
+ * efl: Removed.
+ * efl/install-dependencies: Removed.
+ * efl/jhbuild-optional.modules: Removed.
+ * efl/jhbuild.modules: Removed.
+ * efl/jhbuildrc: Removed.
+ * efl/patches: Removed.
+ * efl/patches/evas-fix-build-with-giflib5.patch: Removed.
+ * efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch: Removed.
+ * efl/patches/gst-libav.patch: Removed.
+ * efl/patches/gst-plugins-base-rtp-rtcpbuffer-fix-typo-in-enum.patch: Removed.
+ * efl/patches/gst-plugins-good-Revert-qtdemux-expose-streams-with-first-moof-for-fr.patch: Removed.
+ * efl/patches/gst-plugins-good-use-the-tfdt-decode-time.patch: Removed.
+ * efl/patches/openwebrtc-gst-plugins-clang-warning-fix.patch: Removed.
+
2017-02-16 Myles C. Maxfield <[email protected]>
font-weight in @font-face can cause a font to be downloaded even when it's not used
Deleted: trunk/Tools/Scripts/run-efl-tests (212513 => 212514)
--- trunk/Tools/Scripts/run-efl-tests 2017-02-17 01:28:00 UTC (rev 212513)
+++ trunk/Tools/Scripts/run-efl-tests 2017-02-17 01:30:41 UTC (rev 212514)
@@ -1,64 +0,0 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2012 Intel Corporation. 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.
-# * Neither the name of Intel Corporation nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# 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.
-
-use strict;
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-my $xvfb_display = ":55";
-
-my $xvfb_pid = fork();
-exit(1) if not defined $xvfb_pid;
-
-# Tell CTest to dump gtest output in case of failure.
-$ENV{CTEST_OUTPUT_ON_FAILURE} = "1";
-$ENV{DISPLAY} = $xvfb_display;
-
-if ($xvfb_pid == 0) {
- # Start Xvfb
- my @xvfb_args = ( "Xvfb $xvfb_display -screen 0 800x600x24 -nolisten tcp > /dev/null 2>&1" );
- exec(@xvfb_args);
-} else {
- setConfiguration();
-
- # Manually add this for jhbuildWrapperPrefixIfNeeded().
- push(@ARGV, "--efl");
-
- my $returnCode = exitStatus(generateBuildSystemFromCMakeProject(undef, cmakeBasedPortArguments()));
- exit($returnCode) if $returnCode;
-
- $returnCode = exitStatus(buildCMakeGeneratedProject("test"));
-
- # Kill Xvfb
- kill(15, $xvfb_pid);
-
- exit($returnCode);
-}
-
Deleted: trunk/Tools/Scripts/update-webkitefl-libs (212513 => 212514)
--- trunk/Tools/Scripts/update-webkitefl-libs 2017-02-17 01:28:00 UTC (rev 212513)
+++ trunk/Tools/Scripts/update-webkitefl-libs 2017-02-17 01:30:41 UTC (rev 212514)
@@ -1,23 +0,0 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2012 Intel Corporation
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-my $scriptsDir = relativeScriptsDir();
-system("perl", "$scriptsDir/update-webkit-libs-jhbuild", "--efl", @ARGV) == 0 or die $!;
Deleted: trunk/Tools/Scripts/webkitpy/port/efl.py (212513 => 212514)
--- trunk/Tools/Scripts/webkitpy/port/efl.py 2017-02-17 01:28:00 UTC (rev 212513)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2017-02-17 01:30:41 UTC (rev 212514)
@@ -1,146 +0,0 @@
-# Copyright (C) 2011 ProFUSION Embedded Systems. All rights reserved.
-# Copyright (C) 2011 Samsung Electronics. All rights reserved.
-# Copyright (C) 2012 Intel Corporation
-#
-# 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 os
-
-from webkitpy.common.system import path
-from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.port.base import Port
-from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
-from webkitpy.port.xorgdriver import XorgDriver
-from webkitpy.port.xvfbdriver import XvfbDriver
-from webkitpy.port.linux_get_crash_log import GDBCrashLogGenerator
-
-
-class EflPort(Port):
- port_name = 'efl'
-
- def __init__(self, *args, **kwargs):
- super(EflPort, self).__init__(*args, **kwargs)
-
- self._jhbuild_wrapper = [self.path_from_webkit_base('Tools', 'jhbuild', 'jhbuild-wrapper'), '--efl', 'run']
-
- self.set_option_default('wrapper', ' '.join(self._jhbuild_wrapper))
- self.webprocess_cmd_prefix = self.get_option('webprocess_cmd_prefix')
-
- self._pulseaudio_sanitizer = PulseAudioSanitizer()
-
- def _port_flag_for_scripts(self):
- return "--efl"
-
- def setup_test_run(self, device_class=None):
- super(EflPort, self).setup_test_run(device_class)
- self._pulseaudio_sanitizer.unload_pulseaudio_module()
-
- def setup_environ_for_server(self, server_name=None):
- env = super(EflPort, self).setup_environ_for_server(server_name)
-
- # If DISPLAY environment variable is unset in the system
- # e.g. on build bot, remove DISPLAY variable from the dictionary
- if not 'DISPLAY' in os.environ:
- del env['DISPLAY']
-
- if 'ACCESSIBILITY_EAIL_LIBRARY_PATH' in os.environ:
- env['ACCESSIBILITY_EAIL_LIBRARY_PATH'] = os.environ['ACCESSIBILITY_EAIL_LIBRARY_PATH']
-
- env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
- env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
-
- # Silence GIO warnings about using the "memory" GSettings backend.
- env['GSETTINGS_BACKEND'] = 'memory'
-
- if self.webprocess_cmd_prefix:
- env['WEB_PROCESS_CMD_PREFIX'] = self.webprocess_cmd_prefix
-
- return env
-
- def default_timeout_ms(self):
- # Tests run considerably slower under gdb
- # or valgrind.
- if self.get_option('webprocess_cmd_prefix'):
- return 350 * 1000
- return super(EflPort, self).default_timeout_ms()
-
- def clean_up_test_run(self):
- super(EflPort, self).clean_up_test_run()
- self._pulseaudio_sanitizer.restore_pulseaudio_module()
-
- def _generate_all_test_configurations(self):
- return [TestConfiguration(version=self._version, architecture='x86', build_type=build_type) for build_type in self.ALL_BUILD_TYPES]
-
- def _driver_class(self):
- if os.environ.get("USE_NATIVE_XDISPLAY"):
- return XorgDriver
- return XvfbDriver
-
- def _path_to_driver(self):
- return self._build_path('bin', self.driver_name())
-
- def _path_to_image_diff(self):
- return self._build_path('bin', 'ImageDiff')
-
- def _image_diff_command(self, *args, **kwargs):
- return self._jhbuild_wrapper + super(EflPort, self)._image_diff_command(*args, **kwargs)
-
- def _path_to_webcore_library(self):
- static_path = self._build_path('lib', 'libwebcore_efl.a')
- dyn_path = self._build_path('lib', 'libwebcore_efl.so')
- return static_path if self._filesystem.exists(static_path) else dyn_path
-
- def _search_paths(self):
- search_paths = []
- search_paths.append(self.port_name)
- search_paths.append('wk2')
- return search_paths
-
- def default_baseline_search_path(self):
- return map(self._webkit_baseline_path, self._search_paths())
-
- def _port_specific_expectations_files(self):
- # FIXME: We should be able to use the default algorithm here.
- return list(reversed([self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in self._search_paths()]))
-
- def show_results_html_file(self, results_filename):
- self._run_script("run-minibrowser", [path.abspath_to_uri(self.host.platform, results_filename)])
-
- def check_sys_deps(self, needs_http):
- return super(EflPort, self).check_sys_deps(needs_http) and self._driver_class().check_driver(self)
-
- def build_webkit_command(self, build_style=None):
- command = super(EflPort, self).build_webkit_command(build_style)
- command.extend(["--efl", "--update-efl"])
- command.append(super(EflPort, self).make_args())
- return command
-
- def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
- return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
-
- def test_expectations_file_position(self):
- # EFL port baseline search path is efl -> wk2 -> generic (as efl-wk2 and efl baselines are merged), so port test expectations file is at third to last position.
- return 2
Deleted: trunk/Tools/Scripts/webkitpy/port/efl_unittest.py (212513 => 212514)
--- trunk/Tools/Scripts/webkitpy/port/efl_unittest.py 2017-02-17 01:28:00 UTC (rev 212513)
+++ trunk/Tools/Scripts/webkitpy/port/efl_unittest.py 2017-02-17 01:30:41 UTC (rev 212514)
@@ -1,54 +0,0 @@
-# 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.executive_mock import MockExecutive
-from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.port.efl import EflPort
-from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
-from webkitpy.port import port_testcase
-
-
-class EflPortTest(port_testcase.PortTestCase):
- port_name = 'efl'
- port_maker = EflPort
-
- # Additionally mocks out the PulseAudioSanitizer methods.
- def make_port(self, host=None, port_name=None, options=None, os_name=None, os_version=None, **kwargs):
- port = super(EflPortTest, self).make_port(host, port_name, options, os_name, os_version, **kwargs)
- port._pulseaudio_sanitizer = PulseAudioSanitizerMock()
- return port
-
- def test_show_results_html_file(self):
- port = self.make_port()
- port._executive = MockExecutive(should_log=True)
- expected_logs = "MOCK run_command: ['Tools/Scripts/run-minibrowser', '--release', '--efl', 'file://test.html'], cwd=/mock-checkout\n"
- OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_logs=expected_logs)
-
- def test_get_crash_log(self):
- # This function tested in linux_get_crash_log_unittest.py
- pass
