Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py |
index fff2d4c7cead96bf670a185cf1d6fd8df558bdfb..ff7ee644582eb0e6bf14ec7b31bc47183b70e2e4 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py |
@@ -218,9 +218,12 @@ class Port(object): |
return True |
def additional_driver_flag(self): |
+ flags = [] |
if self.driver_name() == self.CONTENT_SHELL_NAME: |
- return ['--run-layout-test'] |
- return [] |
+ flags.append('--run-layout-test') |
+ if self.get_option('debug_devtools'): |
+ flags.append('--debug-devtools') |
pfeldman
2016/08/24 00:36:04
We can use additional driver flags instead.
chenwilliam
2016/08/24 22:53:40
Done.
|
+ return flags |
def supports_per_test_timeout(self): |
return False |
@@ -1025,7 +1028,9 @@ class Port(object): |
return self._build_path() |
def inspector_build_directory(self): |
- return self._build_path('resources', 'inspector') |
+ if self.get_option('debug_devtools'): |
+ return self._build_path('resources', 'inspector') |
+ return self._build_path('resources', 'inspector_release') |
pfeldman
2016/08/24 00:36:04
We should be able to substitute this in the native
chenwilliam
2016/08/24 22:53:40
Done.
|
def default_results_directory(self): |
"""Absolute path to the default place to store the test results.""" |