Diff
Modified: trunk/LayoutTests/ChangeLog (245732 => 245733)
--- trunk/LayoutTests/ChangeLog 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/LayoutTests/ChangeLog 2019-05-24 02:27:22 UTC (rev 245733)
@@ -1,3 +1,14 @@
+2019-05-23 Fujii Hironori <[email protected]>
+
+ run-webkit-tests: Remove feature detection support
+ https://bugs.webkit.org/show_bug.cgi?id=198105
+
+ Reviewed by Jonathan Bedard.
+
+ * platform/win/TestExpectations:
+ * platform/wincairo/TestExpectations:
+ Added Skip for all compositing, animations/3d and transforms/3d tests temporarily.
+
2019-05-23 Saam barati <[email protected]>
[WHLSL] Property resolver needs to recurse to handle the base when simplifying rvalues
Modified: trunk/LayoutTests/platform/win/TestExpectations (245732 => 245733)
--- trunk/LayoutTests/platform/win/TestExpectations 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/LayoutTests/platform/win/TestExpectations 2019-05-24 02:27:22 UTC (rev 245733)
@@ -2601,11 +2601,12 @@
######################### Start list of UNREVIEWED failures ########################
################################################################################
+compositing [ Skip ]
+animations/3d [ Skip ]
+transforms/3d [ Skip ]
+
# Skip tests that fail only in Debug mode
-[ Debug ] compositing [ Skip ]
[ Debug ] legacy-animation-engine/compositing [ Skip ]
-[ Debug ] transforms/3d/hit-testing [ Skip ]
-[ Debug ] transforms/3d/point-mapping [ Skip ]
# These failures all seem to be related to the page cache being in a bad state.
[ Debug ] css2.1/t090402-c42-ibx-pad-00-d-ag.html [ Skip ] # Debug assertion
@@ -2693,7 +2694,6 @@
[ Debug ] http/tests/security/listener/xss-window-onclick-addEventListener.html [ Skip ] # Causes later tests to fail
[ Debug ] platform/win/fast/events/panScroll-no-iframe-jump.html [ Skip ] # Causes later tests to fail
[ Debug ] svg/custom/list-items-with-svg-font-family.html [ Skip ] # Causes later tests to fail
-[ Debug ] transforms/3d/general/perspective-non-layer.html [ Failure ]
# These don't seem to be running.
webkit.org/b/113946 compositing/contents-opaque/control-layer.html [ Failure ]
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (245732 => 245733)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2019-05-24 02:27:22 UTC (rev 245733)
@@ -1502,6 +1502,8 @@
# TEMPORARY SKIPS -- these areas still need to be addressed individually
#//////////////////////////////////////////////////////////////////////////////////////////
+animations/3d [ Skip ]
+compositing [ Skip ]
fast/attachment [ Skip ]
fast/backgrounds [ Skip ]
fast/block [ Skip ]
Modified: trunk/Tools/ChangeLog (245732 => 245733)
--- trunk/Tools/ChangeLog 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/ChangeLog 2019-05-24 02:27:22 UTC (rev 245733)
@@ -1,3 +1,57 @@
+2019-05-23 Fujii Hironori <[email protected]>
+
+ run-webkit-tests: Remove feature detection support
+ https://bugs.webkit.org/show_bug.cgi?id=198105
+
+ Reviewed by Jonathan Bedard.
+
+ Feature detection support was added to DRT for Windows and old
+ run-webkit-tests in Bug 35610. It was added for NRWT in Bug 41842.
+ But, it doesn't work for DRT for Windows because of feature name
+ mismatches. Since USE(ACCELERATED_COMPOSITING) flag has been
+ removed in Bug 127833, it is not needed anymore.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (main):
+ * Scripts/webkitpy/port/base.py:
+ (Port._tests_for_other_platforms):
+ (Port._skipped_tests_for_unsupported_features):
+ (Port._runtime_feature_list): Deleted.
+ (Port.nm_command): Deleted.
+ (Port._modules_to_search_for_symbols): Deleted.
+ (Port._symbols_string): Deleted.
+ (Port._missing_feature_to_skipped_tests): Deleted.
+ (Port._has_test_in_directories): Deleted.
+ * Scripts/webkitpy/port/darwin.py:
+ (DarwinPort.make_command):
+ (DarwinPort.nm_command): Deleted.
+ * Scripts/webkitpy/port/ios_simulator.py:
+ (IOSSimulatorPort.reset_preferences):
+ (IOSSimulatorPort.nm_command): Deleted.
+ * Scripts/webkitpy/port/port_testcase.py:
+ (TestWebKitPort.__init__):
+ (TestWebKitPort.all_test_configurations):
+ (PortTestCase.test_path_to_test_expectations_file):
+ (TestWebKitPort._symbols_string): Deleted.
+ (PortTestCase.test_skipped_directories_for_features): Deleted.
+ (PortTestCase.test_skipped_directories_for_features_no_matching_tests_in_test_list): Deleted.
+ (PortTestCase.test_skipped_tests_for_unsupported_features_empty_test_list): Deleted.
+ * Scripts/webkitpy/port/watch_simulator.py:
+ (WatchSimulatorPort.reset_preferences):
+ (WatchSimulatorPort.nm_command): Deleted.
+ * Scripts/webkitpy/port/win.py:
+ (WinPort.show_results_html_file):
+ (WinPort._runtime_feature_list): Deleted.
+ * Scripts/webkitpy/port/win_unittest.py:
+ (WinPortTest.test_operating_system):
+ (WinPortTest.test_runtime_feature_list): Deleted.
+ * WebKitTestRunner/Options.cpp:
+ (WTR::OptionsHandler::OptionsHandler):
+ (WTR::handleOptionPrintSupportedFeatures): Deleted.
+ * WebKitTestRunner/Options.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+
2019-05-23 Commit Queue <[email protected]>
Unreviewed, rolling out r245665.
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (245732 => 245733)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2019-05-24 02:27:22 UTC (rev 245733)
@@ -104,7 +104,6 @@
static bool gcBetweenTests = true;
static bool printSeparators = false;
static bool leakChecking = false;
-static bool printSupportedFeatures = false;
static bool showWebView = false;
static RetainPtr<CFStringRef> persistentUserStyleSheetLocation;
@@ -1465,11 +1464,6 @@
continue;
}
- if (!stricmp(argv[i], "--print-supported-features")) {
- printSupportedFeatures = true;
- continue;
- }
-
if (!stricmp(argv[i], "--show-webview")) {
showWebView = true;
continue;
@@ -1580,23 +1574,6 @@
prepareConsistentTestingEnvironment(standardPreferences.get(), standardPreferencesPrivate.get());
- if (printSupportedFeatures) {
- BOOL acceleratedCompositingAvailable = FALSE;
- standardPreferences->acceleratedCompositingEnabled(&acceleratedCompositingAvailable);
-
-#if ENABLE(3D_TRANSFORMS)
- // In theory, we could have a software-based 3D rendering implementation that we use when
- // hardware-acceleration is not available. But we don't have any such software
- // implementation, so 3D rendering is only available when hardware-acceleration is.
- BOOL threeDTransformsAvailable = acceleratedCompositingAvailable;
-#else
- BOOL threeDTransformsAvailable = FALSE;
-#endif
-
- fprintf(testResult, "SupportedFeatures:%s %s\n", acceleratedCompositingAvailable ? "AcceleratedCompositing" : "", threeDTransformsAvailable ? "3DTransforms" : "");
- return 0;
- }
-
COMPtr<IWebView> webView(AdoptCOM, createWebViewAndOffscreenWindow(&webViewWindow));
if (!webView)
return -4;
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (245732 => 245733)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2019-05-24 02:27:22 UTC (rev 245733)
@@ -31,11 +31,9 @@
test infrastructure (the Port and Driver classes)."""
import difflib
-import itertools
import json
import logging
import os
-import operator
import optparse
import re
import sys
@@ -1557,64 +1555,7 @@
dirs_to_skip.append('platform/%s' % basename)
return dirs_to_skip
- def _runtime_feature_list(self):
- """If a port makes certain features available only through runtime flags, it can override this routine to indicate which ones are available."""
- return None
-
- def nm_command(self):
- return 'nm'
-
- def _modules_to_search_for_symbols(self):
- path = self._path_to_webcore_library()
- if path:
- return [path]
- return []
-
- def _symbols_string(self):
- symbols = ''
- for path_to_module in self._modules_to_search_for_symbols():
- try:
- symbols += self._executive.run_command([self.nm_command(), path_to_module], ignore_errors=True)
- except OSError as e:
- _log.warn("Failed to run nm: %s. Can't determine supported features correctly." % e)
- return symbols
-
- # Ports which use run-time feature detection should define this method and return
- # a dictionary mapping from Feature Names to skipped directoires. NRWT will
- # run DumpRenderTree --print-supported-features and parse the output.
- # If the Feature Names are not found in the output, the corresponding directories
- # will be skipped.
- def _missing_feature_to_skipped_tests(self):
- """Return the supported feature dictionary. Keys are feature names and values
- are the lists of directories to skip if the feature name is not matched."""
- # FIXME: This list matches WebKitWin and should be moved onto the Win port.
- return {
- "Accelerated Compositing": ["compositing"],
- "3D Rendering": ["animations/3d", "transforms/3d"],
- }
-
- def _has_test_in_directories(self, directory_lists, test_list):
- if not test_list:
- return False
-
- directories = itertools.chain.from_iterable(directory_lists)
- for directory, test in itertools.product(directories, test_list):
- if test.startswith(directory):
- return True
- return False
-
def _skipped_tests_for_unsupported_features(self, test_list):
- # Only check the runtime feature list of there are tests in the test_list that might get skipped.
- # This is a performance optimization to avoid the subprocess call to DRT.
- # If the port supports runtime feature detection, disable any tests
- # for features missing from the runtime feature list.
- # If _runtime_feature_list returns a non-None value, then prefer
- # runtime feature detection over static feature detection.
- if self._has_test_in_directories(self._missing_feature_to_skipped_tests().values(), test_list):
- supported_feature_list = self._runtime_feature_list()
- if supported_feature_list is not None:
- return reduce(operator.add, [directories for feature, directories in self._missing_feature_to_skipped_tests().items() if feature not in supported_feature_list])
-
return []
def _wk2_port_name(self):
Modified: trunk/Tools/Scripts/webkitpy/port/darwin.py (245732 => 245733)
--- trunk/Tools/Scripts/webkitpy/port/darwin.py 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/Scripts/webkitpy/port/darwin.py 2019-05-24 02:27:22 UTC (rev 245733)
@@ -233,9 +233,6 @@
def make_command(self):
return self.xcrun_find('make', '/usr/bin/make')
- def nm_command(self):
- return self.xcrun_find('nm', 'nm')
-
def xcrun_find(self, command, fallback=None):
fallback = fallback or command
try:
Modified: trunk/Tools/Scripts/webkitpy/port/ios_simulator.py (245732 => 245733)
--- trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2019-05-24 02:27:22 UTC (rev 245733)
@@ -96,9 +96,6 @@
_log.debug("reset_preferences")
SimulatedDeviceManager.tear_down(self.host)
- def nm_command(self):
- return self.xcrun_find('nm')
-
@property
@memoized
def developer_dir(self):
Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (245732 => 245733)
--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2019-05-24 02:27:22 UTC (rev 245733)
@@ -56,11 +56,10 @@
class TestWebKitPort(Port):
port_name = "testwebkitport"
- def __init__(self, port_name=None, symbols_string=None,
+ def __init__(self, port_name=None,
expectations_file=None, skips_file=None, host=None, config=None,
**kwargs):
port_name = port_name or TestWebKitPort.port_name
- self.symbols_string = symbols_string # Passing "" disables all staticly-detectable features.
host = host or MockSystemHost()
super(TestWebKitPort, self).__init__(host, port_name=port_name, **kwargs)
@@ -67,9 +66,6 @@
def all_test_configurations(self):
return [self.test_configuration()]
- def _symbols_string(self):
- return self.symbols_string
-
def _tests_for_other_platforms(self, **kwargs):
return ["media", ]
@@ -500,26 +496,6 @@
port._options = MockOptions(webkit_test_runner=False)
self.assertEqual(port.path_to_test_expectations_file(), '/mock-checkout/LayoutTests/platform/testwebkitport/TestExpectations')
- def test_skipped_directories_for_features(self):
- supported_features = ["Accelerated Compositing", "Foo Feature"]
- expected_directories = set(["animations/3d", "transforms/3d"])
- port = TestWebKitPort(supported_features=supported_features)
- port._runtime_feature_list = lambda: supported_features
- result_directories = set(port._skipped_tests_for_unsupported_features(test_list=["animations/3d/foo.html"]))
- self.assertEqual(result_directories, expected_directories)
-
- def test_skipped_directories_for_features_no_matching_tests_in_test_list(self):
- supported_features = ["Accelerated Compositing", "Foo Feature"]
- expected_directories = set([])
- result_directories = set(TestWebKitPort(supported_features=supported_features)._skipped_tests_for_unsupported_features(test_list=['foo.html']))
- self.assertEqual(result_directories, expected_directories)
-
- def test_skipped_tests_for_unsupported_features_empty_test_list(self):
- supported_features = ["Accelerated Compositing", "Foo Feature"]
- expected_directories = set([])
- result_directories = set(TestWebKitPort(supported_features=supported_features)._skipped_tests_for_unsupported_features(test_list=None))
- self.assertEqual(result_directories, expected_directories)
-
def test_skipped_layout_tests(self):
self.assertEqual(TestWebKitPort().skipped_layout_tests(test_list=[]), set(['media']))
Modified: trunk/Tools/Scripts/webkitpy/port/watch_simulator.py (245732 => 245733)
--- trunk/Tools/Scripts/webkitpy/port/watch_simulator.py 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/Scripts/webkitpy/port/watch_simulator.py 2019-05-24 02:27:22 UTC (rev 245733)
@@ -87,9 +87,6 @@
def reset_preferences(self):
SimulatedDeviceManager.tear_down(self.host)
- def nm_command(self):
- return self.xcrun_find('nm')
-
@property
@memoized
def developer_dir(self):
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (245732 => 245733)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2019-05-24 02:27:22 UTC (rev 245733)
@@ -154,20 +154,6 @@
def show_results_html_file(self, results_filename):
self._run_script('run-safari', [abspath_to_uri(SystemHost().platform, results_filename)])
- def _runtime_feature_list(self):
- supported_features_command = [self._path_to_driver(), '--print-supported-features']
- try:
- output = self._executive.run_command(supported_features_command, ignore_errors=True)
- except OSError as e:
- _log.warn("Exception running driver: %s, %s. Driver must be built before calling WebKitPort.test_expectations()." % (supported_features_command, e))
- return None
-
- # Note: win/DumpRenderTree.cpp does not print a leading space before the features_string.
- match_object = re.match("SupportedFeatures:\s*(?P<features_string>.*)\s*", output)
- if not match_object:
- return None
- return match_object.group('features_string').split(' ')
-
def _build_path(self, *comps):
"""Returns the full path to the test driver (DumpRenderTree)."""
root_directory = self.get_option('_cached_root') or self.get_option('root')
Modified: trunk/Tools/Scripts/webkitpy/port/win_unittest.py (245732 => 245733)
--- trunk/Tools/Scripts/webkitpy/port/win_unittest.py 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/Scripts/webkitpy/port/win_unittest.py 2019-05-24 02:27:22 UTC (rev 245733)
@@ -93,14 +93,6 @@
def test_operating_system(self):
self.assertEqual('win', self.make_port().operating_system())
- def test_runtime_feature_list(self):
- port = self.make_port()
- port._executive.run_command = lambda command, cwd=None, ignore_errors=False: "Nonsense"
- # runtime_features_list returns None when its results are meaningless (it couldn't run DRT or parse the output, etc.)
- self.assertEqual(port._runtime_feature_list(), None)
- port._executive.run_command = lambda command, cwd=None, ignore_errors=False: "SupportedFeatures:foo bar"
- self.assertEqual(port._runtime_feature_list(), ['foo', 'bar'])
-
def test_expectations_files(self):
self.assertEqual(len(self.make_port().expectations_files()), 3)
self.assertEqual(len(self.make_port(options=MockOptions(webkit_test_runner=True, configuration='Release')).expectations_files()), 5)
Modified: trunk/Tools/WebKitTestRunner/Options.cpp (245732 => 245733)
--- trunk/Tools/WebKitTestRunner/Options.cpp 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/WebKitTestRunner/Options.cpp 2019-05-24 02:27:22 UTC (rev 245733)
@@ -57,12 +57,6 @@
return true;
}
-static bool handleOptionPrintSupportedFeatures(Options& options, const char*, const char*)
-{
- options.printSupportedFeatures = true;
- return true;
-}
-
static bool handleOptionComplexText(Options& options, const char*, const char*)
{
options.forceComplexText = true;
@@ -127,7 +121,6 @@
optionList.append(Option("--gc-between-tests", "Garbage collection between tests.", handleOptionGcBetweenTests));
optionList.append(Option("--pixel-tests", "Check pixels.", handleOptionPixelTests));
optionList.append(Option("-p", "Check pixels.", handleOptionPixelTests));
- optionList.append(Option("--print-supported-features", "For DumpRenderTree compatibility.", handleOptionPrintSupportedFeatures));
optionList.append(Option("--complex-text", "Force complex tests.", handleOptionComplexText));
optionList.append(Option("--accelerated-drawing", "Use accelerated drawing.", handleOptionAcceleratedDrawing));
optionList.append(Option("--remote-layer-tree", "Use remote layer tree.", handleOptionRemoteLayerTree));
Modified: trunk/Tools/WebKitTestRunner/Options.h (245732 => 245733)
--- trunk/Tools/WebKitTestRunner/Options.h 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/WebKitTestRunner/Options.h 2019-05-24 02:27:22 UTC (rev 245733)
@@ -42,7 +42,6 @@
bool verbose { false };
bool gcBetweenTests { false };
bool shouldDumpPixelsForAllTests { false };
- bool printSupportedFeatures { false };
bool forceComplexText { false };
bool shouldUseAcceleratedDrawing { false };
bool shouldUseRemoteLayerTree { false };
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (245732 => 245733)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2019-05-24 02:09:46 UTC (rev 245732)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2019-05-24 02:27:22 UTC (rev 245733)
@@ -459,13 +459,6 @@
m_checkForWorldLeaks = options.checkForWorldLeaks;
m_allowAnyHTTPSCertificateForAllowedHosts = options.allowAnyHTTPSCertificateForAllowedHosts;
- if (options.printSupportedFeatures) {
- // FIXME: On Windows, DumpRenderTree uses this to expose whether it supports 3d
- // transforms and accelerated compositing. When we support those features, we
- // should match DRT's behavior.
- exit(0);
- }
-
m_usingServerMode = (m_paths.size() == 1 && m_paths[0] == "-");
if (m_usingServerMode)
m_printSeparators = true;
