Changeset 252948 in webkit

Timestamp:

Nov 29, 2019 10:54:17 AM (4 years ago)

Author:

Antti Koivisto

Message:

Add mechanism for enabling internal and experimental features from run-webkit-test command line
​https://bugs.webkit.org/show_bug.cgi?id=204702

Reviewed by Antoine Quint.

Add --internal-feature and --experimental-feature flags to TestRunner and run-webkit-tests.
This is useful for running existing tests with different feature enabled without modifying
anything else. For example:

run-webkit-tests --internal-feature LayoutFormattingContextRenderTreeIntegrationEnabled

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(parse_args):

• Scripts/webkitpy/port/base.py:

(Port.internal_feature):
(Port):
(Port.experimental_feature):

• Scripts/webkitpy/port/driver.py:

(Driver.cmd_line):

• WebKitTestRunner/Options.cpp:

(WTR::handleOptionExperimentalFeature):
(WTR::handleOptionInternalFeature):
(WTR::OptionsHandler::OptionsHandler):

• WebKitTestRunner/Options.h:
• WebKitTestRunner/TestController.cpp:

(WTR::TestController::initialize):
(WTR::TestController::testOptionsForTest const):

• WebKitTestRunner/TestController.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/port/driver.py (modified) (1 diff)
• WebKitTestRunner/Options.cpp (modified) (2 diffs)
• WebKitTestRunner/Options.h (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (2 diffs)
• WebKitTestRunner/TestController.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-11-29  Antti Koivisto  <antti@apple.com>
+
+        Add mechanism for enabling internal and experimental features from run-webkit-test command line
+        https://bugs.webkit.org/show_bug.cgi?id=204702
+
+        Reviewed by Antoine Quint.
+
+        Add --internal-feature and --experimental-feature flags to TestRunner and run-webkit-tests.
+        This is useful for running existing tests with different feature enabled without modifying
+        anything else. For example:
+
+        run-webkit-tests --internal-feature LayoutFormattingContextRenderTreeIntegrationEnabled
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (parse_args):
+        * Scripts/webkitpy/port/base.py:
+        (Port.internal_feature):
+        (Port):
+        (Port.experimental_feature):
+        * Scripts/webkitpy/port/driver.py:
+        (Driver.cmd_line):
+        * WebKitTestRunner/Options.cpp:
+        (WTR::handleOptionExperimentalFeature):
+        (WTR::handleOptionInternalFeature):
+        (WTR::OptionsHandler::OptionsHandler):
+        * WebKitTestRunner/Options.h:
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize):
+        (WTR::TestController::testOptionsForTest const):
+        * WebKitTestRunner/TestController.h:
+
 2019-11-29  Aakash Jain  <aakash_jain@apple.com>
 

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

@@ -119 +119 @@
         optparse.make_option("--remote-layer-tree", action="store_true", default=False,
             help="Use the remote layer tree drawing model (OS X WebKit2 only)"),
+        optparse.make_option("--internal-feature", type="string", action="append",
+            default=[], help="Enable internal feature"),
+        optparse.make_option("--experimental-feature", type="string", action="append",
+            default=[], help="Enable experimental feature"),
     ]))
 

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

@@ -1194 +1194 @@
         return self.get_option("allowed_host", [])
 
+    def internal_feature(self):
+        return self.get_option("internal_feature", [])
+
+    def experimental_feature(self):
+        return self.get_option("experimental_feature", [])
+
     def default_configuration(self):
         return self._config.default_configuration()

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

@@ -524 +524 @@
             cmd.append(allowed_host)
 
+        for feature in self._port.internal_feature():
+            cmd.append('--internal-feature')
+            cmd.append(feature)
+
+        for feature in self._port.experimental_feature():
+            cmd.append('--experimental-feature')
+            cmd.append(feature)
+
         cmd.extend(self._port.get_option('additional_drt_flag', []))
         cmd.extend(self._port.additional_drt_flag())

trunk/Tools/WebKitTestRunner/Options.cpp

@@ -106 +106 @@
 }
 
+static bool handleOptionExperimentalFeature(Options& options, const char*, const char* feature)
+{
+    options.experimentalFeatures.insert(feature);
+    return true;
+}
+
+static bool handleOptionInternalFeature(Options& options, const char*, const char* feature)
+{
+    options.internalFeatures.insert(feature);
+    return true;
+}
+
 static bool handleOptionUnmatched(Options& options, const char* option, const char*)
 {
@@ -130 +142 @@
     optionList.append(Option("--show-touches", "Show the touches during test runs (for debugging)", handleOptionShowTouches));
     optionList.append(Option("--world-leaks", "Check for leaks of world objects (currently, documents)", handleOptionCheckForWorldLeaks));
+    optionList.append(Option("--experimental-feature", "Enable experimental feature", handleOptionExperimentalFeature, true));
+    optionList.append(Option("--internal-feature", "Enable internal feature", handleOptionInternalFeature, true));
 
     optionList.append(Option(0, 0, handleOptionUnmatched));

trunk/Tools/WebKitTestRunner/Options.h

@@ -52 +52 @@
     std::vector<std::string> paths;
     std::set<std::string> allowedHosts;
+    std::set<std::string> internalFeatures;
+    std::set<std::string> experimentalFeatures;
 };
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -473 +473 @@
     m_checkForWorldLeaks = options.checkForWorldLeaks;
     m_allowAnyHTTPSCertificateForAllowedHosts = options.allowAnyHTTPSCertificateForAllowedHosts;
+    m_internalFeatures = options.internalFeatures;
+    m_experimentalFeatures = options.experimentalFeatures;
 
     m_usingServerMode = (m_paths.size() == 1 && m_paths[0] == "-");
@@ -1454 +1456 @@
     options.shouldShowWebView = m_shouldShowWebView;
 
+    for (auto& feature : m_internalFeatures)
+        options.internalDebugFeatures.add(feature.c_str(), true);
+    for (auto& feature : m_experimentalFeatures)
+        options.experimentalFeatures.add(feature.c_str(), true);
+
     updatePlatformSpecificTestOptionsForTest(options, command.pathOrURL);
     updateTestOptionsFromTestHeader(options, command.pathOrURL, command.absolutePath);

trunk/Tools/WebKitTestRunner/TestController.h

@@ -501 +501 @@
     std::vector<std::string> m_paths;
     std::set<std::string> m_allowedHosts;
+    std::set<std::string> m_internalFeatures;
+    std::set<std::string> m_experimentalFeatures;
+
     WKRetainPtr<WKStringRef> m_injectedBundlePath;
     WKRetainPtr<WKStringRef> m_testPluginDirectory;
@@ -573 +576 @@
 
     bool m_allowAnyHTTPSCertificateForAllowedHosts { false };
-    
+
     bool m_shouldDecideNavigationPolicyAfterDelay { false };
     bool m_shouldDecideResponsePolicyAfterDelay { false };