Changeset 181093 in webkit


Ignore:
Timestamp:
Mar 5, 2015 12:11:04 PM (9 years ago)
Author:
Chris Dumez
Message:

run-webkit-tests and run-perf-tests should use WebKitTestRunner by default
​https://bugs.webkit.org/show_bug.cgi?id=142325

Reviewed by Csaba Osztrogonác.

run-webkit-tests and run-perf-tests now use WebKitTestRunner by default.
As a result, "--webkit-test-runner / -2" parameters are replaced by
"--dump-render-tree / -1" so developers can run DumpRenderTree rather
than WebKitTestRunner.

  • BuildSlaveSupport/build.webkit.org-config/config.json:
  • BuildSlaveSupport/build.webkit.org-config/master.cfg:

(RunWebKit1Tests):
(RunWebKit1Tests.start):
(RunWebKit1LeakTests):
(RunWebKit1LeakTests.start):
(RunAndUploadPerfTestsWebKit1):
(RunAndUploadPerfTestsWebKit1.start):
(TestFactory):
(TestWebKit1LeaksFactory):
(TestWebKit1LeaksFactory.init):
(TestWebKit1Factory):
(TestWebKit1AllButJSCFactory):
(TestAllButJSCFactory):
(BuildAndPerfTestWebKit1Factory):
(BuildAndPerfTestWebKit1Factory.init):
(BuildAndPerfTestFactory):
(BuildAndPerfTestFactory.init):
(DownloadAndPerfTestWebKit1Factory):
(DownloadAndPerfTestWebKit1Factory.init):
(DownloadAndPerfTestFactory):
(DownloadAndPerfTestFactory.init):
(RunWebKitLeakTests): Deleted.
(RunWebKitLeakTests.start): Deleted.
(RunWebKit2Tests): Deleted.
(RunWebKit2Tests.start): Deleted.
(RunAndUploadPerfTestsWebKit2): Deleted.
(RunAndUploadPerfTestsWebKit2.start): Deleted.
(TestLeaksFactory): Deleted.
(TestLeaksFactory.init): Deleted.
(TestWebKit2Factory): Deleted.
(TestWebKit2AndJSCFactory): Deleted.
(BuildAndPerfTestWebKit2Factory): Deleted.
(BuildAndPerfTestWebKit2Factory.init): Deleted.
(DownloadAndPerfTestWebKit2Factory): Deleted.
(DownloadAndPerfTestWebKit2Factory.init): Deleted.

  • Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(parse_args):

  • Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._parse_args):

  • Scripts/webkitpy/port/port_testcase.py:

(PortTestCase.test_build_driver):

Location:
trunk/Tools
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

    r181050 r181093  
    6262                  ],
    6363
    64     "builders":   [ { "name": "Apple Yosemite (Leaks)", "type": "TestLeaks", "builddir": "yosemite-leaks",
     64    "builders":   [ { "name": "Apple Yosemite (Leaks)", "type": "TestWebKit1Leaks", "builddir": "yosemite-leaks",
    6565                      "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
    6666                      "additionalArguments": ["--no-retry-failures"],
    … …  
    7676                      "slavenames": ["bot101", "bot105"]
    7777                    },
    78                     { "name": "Apple Mavericks Debug WK1 (Tests)", "type": "Test", "builddir": "mavericks-debug-tests-wk1",
     78                    { "name": "Apple Mavericks Debug WK1 (Tests)", "type": "TestWebKit1", "builddir": "mavericks-debug-tests-wk1",
    7979                      "platform": "mac-mavericks", "configuration": "debug", "architectures": ["x86_64"],
    8080                      "additionalArguments": ["--no-retry-failures"],
    8181                      "slavenames": ["bot124", "bot108"]
    8282                    },
    83                     { "name": "Apple Mavericks Debug WK2 (Tests)", "type": "TestWebKit2", "builddir": "mavericks-debug-tests-wk2",
     83                    { "name": "Apple Mavericks Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "mavericks-debug-tests-wk2",
    8484                      "platform": "mac-mavericks", "configuration": "debug", "architectures": ["x86_64"],
    8585                      "additionalArguments": ["--no-retry-failures"],
    … …  
    9999                      "slavenames": ["bot301", "bot306"]
    100100                    },
    101                     { "name": "Apple Mavericks Release WK1 (Tests)", "type": "Test", "builddir": "mavericks-release-tests-wk1",
     101                    { "name": "Apple Mavericks Release WK1 (Tests)", "type": "TestWebKit1", "builddir": "mavericks-release-tests-wk1",
    102102                      "platform": "mac-mavericks", "configuration": "release", "architectures": ["x86_64"],
    103103                      "additionalArguments": ["--no-retry-failures"],
    104104                      "slavenames": ["bot199", "bot151"]
    105105                    },
    106                     { "name": "Apple Mavericks Release WK2 (Tests)", "type": "TestWebKit2", "builddir": "mavericks-release-tests-wk2",
     106                    { "name": "Apple Mavericks Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "mavericks-release-tests-wk2",
    107107                      "platform": "mac-mavericks", "configuration": "release", "architectures": ["x86_64"],
    108108                      "additionalArguments": ["--no-retry-failures"],
    … …  
    110110                    },
    111111                    {
    112                       "name": "Apple Mavericks Release WK2 (Perf)", "type": "DownloadAndPerfTestWebKit2", "builddir": "mavericks-release-perf-tests",
     112                      "name": "Apple Mavericks Release WK2 (Perf)", "type": "DownloadAndPerfTest", "builddir": "mavericks-release-perf-tests",
    113113                      "platform": "mac-mavericks", "configuration": "release", "architectures": ["x86_64"],
    114114                      "slavenames": ["bot135"]
    … …  
    123123                      "slavenames": ["bot155"]
    124124                    },
    125                     { "name": "Apple Yosemite Debug WK1 (Tests)", "type": "TestAllButJSC", "builddir": "yosemite-debug-tests-wk1",
     125                    { "name": "Apple Yosemite Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "yosemite-debug-tests-wk1",
    126126                      "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
    127127                      "additionalArguments": ["--no-retry-failures"],
    128128                      "slavenames": ["bot182", "bot183"]
    129129                    },
    130                     { "name": "Apple Yosemite Debug WK2 (Tests)", "type": "TestWebKit2", "builddir": "yosemite-debug-tests-wk2",
     130                    { "name": "Apple Yosemite Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "yosemite-debug-tests-wk2",
    131131                      "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
    132132                      "additionalArguments": ["--no-retry-failures"],
    … …  
    150150                      "slavenames": ["bot157"]
    151151                    },
    152                     { "name": "Apple Yosemite Release WK1 (Tests)", "type": "TestAllButJSC", "builddir": "yosemite-release-tests-wk1",
     152                    { "name": "Apple Yosemite Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "yosemite-release-tests-wk1",
    153153                      "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
    154154                      "additionalArguments": ["--no-retry-failures"],
    155155                      "slavenames": ["bot190", "bot191"]
    156156                    },
    157                     { "name": "Apple Yosemite Release WK2 (Tests)", "type": "TestWebKit2", "builddir": "yosemite-release-tests-wk2",
     157                    { "name": "Apple Yosemite Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "yosemite-release-tests-wk2",
    158158                      "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
    159159                      "additionalArguments": ["--no-retry-failures"],
    … …  
    161161                    },
    162162                    {
    163                       "name": "Apple Yosemite Release WK2 (Perf)", "type": "DownloadAndPerfTestWebKit2", "builddir": "yosemite-release-perf-tests",
     163                      "name": "Apple Yosemite Release WK2 (Perf)", "type": "DownloadAndPerfTest", "builddir": "yosemite-release-perf-tests",
    164164                      "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
    165165                      "slavenames": ["bot194"]
    … …  
    172172                    },
    173173                    {
    174                       "name": "Apple Win 7 Release (Tests)", "type": "Test", "builddir": "win-release-tests",
     174                      "name": "Apple Win 7 Release (Tests)", "type": "TestWebKit1", "builddir": "win-release-tests",
    175175                      "platform": "win", "configuration": "release", "architectures": ["i386"],
    176176                      "slavenames": ["bot511", "bot501"]
    … …  
    183183                    },
    184184                    {
    185                       "name": "Apple Win 7 Debug (Tests)", "type": "Test", "builddir": "win-debug-tests",
     185                      "name": "Apple Win 7 Debug (Tests)", "type": "TestWebKit1", "builddir": "win-debug-tests",
    186186                      "platform": "win", "configuration": "debug", "architectures": ["i386"],
    187187                      "slavenames": ["bot507", "bot504"]
    … …  
    199199                    },
    200200                    {
    201                       "name": "GTK Linux 64-bit Release (Tests)", "type": "TestWebKit2AndJSC", "builddir": "gtk-linux-64-release-tests",
     201                      "name": "GTK Linux 64-bit Release (Tests)", "type": "Test", "builddir": "gtk-linux-64-release-tests",
    202202                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    203203                      "slavenames": ["gtk-linux-slave-6"]
    … …  
    210210                    },
    211211                    {
    212                       "name": "GTK Linux 64-bit Debug (Tests)", "type": "TestWebKit2AndJSC", "builddir": "gtk-linux-64-debug-tests",
     212                      "name": "GTK Linux 64-bit Debug (Tests)", "type": "Test", "builddir": "gtk-linux-64-debug-tests",
    213213                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
    214214                      "slavenames": ["gtk-linux-slave-7"]
    … …  
    220220                    },
    221221                    {
    222                       "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTestWebKit2", "builddir": "gtk-linux-64-release-perf-tests",
     222                      "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "gtk-linux-64-release-perf-tests",
    223223                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    224224                      "slavenames": ["gtk-linux-slave-8"]
    … …  
    247247                    },
    248248                    {
    249                       "name": "EFL Linux 64-bit Release WK2 (Perf)", "type": "BuildAndPerfTestWebKit2", "builddir": "efl-linux-64-release-wk2-perf",
     249                      "name": "EFL Linux 64-bit Release WK2 (Perf)", "type": "BuildAndPerfTest", "builddir": "efl-linux-64-release-wk2-perf",
    250250                      "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
    251251                      "SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

    r180999 r181093  
    629629        return SUCCESS
    630630
    631 class RunWebKitLeakTests(RunWebKitTests):
     631class RunWebKit1Tests(RunWebKitTests):
     632    def start(self):
     633        self.setCommand(self.command + ["--dump-render-tree"])
     634
     635        return RunWebKitTests.start(self)
     636
     637class RunWebKit1LeakTests(RunWebKit1Tests):
    632638    warnOnWarnings = True
    633639    def start(self):
    634640        self.setCommand(self.command + ["--leaks"])
    635         return RunWebKitTests.start(self)
    636 
    637 
    638 class RunWebKit2Tests(RunWebKitTests):
    639     def start(self):
    640         self.setCommand(self.command + ["--webkit-test-runner"])
    641 
    642         return RunWebKitTests.start(self)
    643 
     641        return RunWebKit1Tests.start(self)
    644642
    645643class RunAndUploadPerfTests(shell.Test):
    … …  
    682680
    683681        return [self.name]
    684 
    685 
    686 class RunAndUploadPerfTestsWebKit2(RunAndUploadPerfTests):
    687     def start(self):
    688         self.setCommand(self.command + ["--webkit-test-runner"])
    689         return RunAndUploadPerfTests.start(self)
    690682
    691683
    … …  
    840832        self.addStep(RunRemoteJavaScriptCoreTests())
    841833
    842 class TestLeaksFactory(Factory):
     834class TestWebKit1LeaksFactory(Factory):
    843835    def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None):
    844836        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
    845837        self.addStep(DownloadBuiltProduct())
    846838        self.addStep(ExtractBuiltProduct())
    847         self.addStep(RunWebKitLeakTests())
     839        self.addStep(RunWebKit1LeakTests())
    848840        self.addStep(ArchiveTestResults())
    849841        self.addStep(UploadTestResults())
    … …  
    860852        self.addStep(RunJavaScriptCoreTests())
    861853
    862 class TestWebKit2Factory(TestFactory):
    863     LayoutTestClass = RunWebKit2Tests
     854class TestWebKit1Factory(TestFactory):
     855    LayoutTestClass = RunWebKit1Tests
     856
     857class TestWebKit1AllButJSCFactory(TestWebKit1Factory):
    864858    JSCTestClass = None
    865 
    866 class TestWebKit2AndJSCFactory(TestFactory):
    867     LayoutTestClass = RunWebKit2Tests
    868859
    869860class BuildAndPerfTestFactory(Factory):
    … …  
    872863        self.addStep(CompileWebKit())
    873864        self.addStep(RunAndUploadPerfTests())
    874 
    875 class BuildAndPerfTestWebKit2Factory(Factory):
    876     def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
    877         Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
    878         self.addStep(CompileWebKit())
    879         self.addStep(RunAndUploadPerfTestsWebKit2())
    880865
    881866class DownloadAndPerfTestFactory(Factory):
    … …  
    885870        self.addStep(ExtractBuiltProduct())
    886871        self.addStep(RunAndUploadPerfTests())
    887 
    888 class DownloadAndPerfTestWebKit2Factory(Factory):
    889     def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
    890         Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
    891         self.addStep(DownloadBuiltProduct())
    892         self.addStep(ExtractBuiltProduct())
    893         self.addStep(RunAndUploadPerfTestsWebKit2())
    894872
    895873class PlatformSpecificScheduler(AnyBranchScheduler):

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py

    r181070 r181093  
    372372    'Apple Mavericks LLINT CLoop (BuildAndTest)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'webkit-jsc-cloop-test'],
    373373    'Apple Mavericks Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
    374     'Apple Mavericks Release (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'perf-test'],
     374    'Apple Mavericks Release WK2 (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'perf-test'],
    375375    'Apple Mavericks Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
    376376    'Apple Mavericks Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
    … …  
    390390    'Apple Yosemite Release (32-bit Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
    391391    'Apple Yosemite Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
    392     'Apple Yosemite Release (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'perf-test'],
     392    'Apple Yosemite Release WK2 (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'perf-test'],
    393393    'Apple Yosemite Release JSC (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'jscore-test'],
    394394    'Apple Yosemite Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],

  • trunk/Tools/ChangeLog

    r181092 r181093  
     12015-03-05  Chris Dumez  <cdumez@apple.com>
     2
     3        run-webkit-tests and run-perf-tests should use WebKitTestRunner by default
     4        https://bugs.webkit.org/show_bug.cgi?id=142325
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        run-webkit-tests and run-perf-tests now use WebKitTestRunner by default.
     9        As a result, "--webkit-test-runner / -2" parameters are replaced by
     10        "--dump-render-tree / -1" so developers can run DumpRenderTree rather
     11        than WebKitTestRunner.
     12
     13        * BuildSlaveSupport/build.webkit.org-config/config.json:
     14        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
     15        (RunWebKit1Tests):
     16        (RunWebKit1Tests.start):
     17        (RunWebKit1LeakTests):
     18        (RunWebKit1LeakTests.start):
     19        (RunAndUploadPerfTestsWebKit1):
     20        (RunAndUploadPerfTestsWebKit1.start):
     21        (TestFactory):
     22        (TestWebKit1LeaksFactory):
     23        (TestWebKit1LeaksFactory.__init__):
     24        (TestWebKit1Factory):
     25        (TestWebKit1AllButJSCFactory):
     26        (TestAllButJSCFactory):
     27        (BuildAndPerfTestWebKit1Factory):
     28        (BuildAndPerfTestWebKit1Factory.__init__):
     29        (BuildAndPerfTestFactory):
     30        (BuildAndPerfTestFactory.__init__):
     31        (DownloadAndPerfTestWebKit1Factory):
     32        (DownloadAndPerfTestWebKit1Factory.__init__):
     33        (DownloadAndPerfTestFactory):
     34        (DownloadAndPerfTestFactory.__init__):
     35        (RunWebKitLeakTests): Deleted.
     36        (RunWebKitLeakTests.start): Deleted.
     37        (RunWebKit2Tests): Deleted.
     38        (RunWebKit2Tests.start): Deleted.
     39        (RunAndUploadPerfTestsWebKit2): Deleted.
     40        (RunAndUploadPerfTestsWebKit2.start): Deleted.
     41        (TestLeaksFactory): Deleted.
     42        (TestLeaksFactory.__init__): Deleted.
     43        (TestWebKit2Factory): Deleted.
     44        (TestWebKit2AndJSCFactory): Deleted.
     45        (BuildAndPerfTestWebKit2Factory): Deleted.
     46        (BuildAndPerfTestWebKit2Factory.__init__): Deleted.
     47        (DownloadAndPerfTestWebKit2Factory): Deleted.
     48        (DownloadAndPerfTestWebKit2Factory.__init__): Deleted.
     49        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
     50        (parse_args):
     51        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
     52        (PerfTestsRunner._parse_args):
     53        * Scripts/webkitpy/port/port_testcase.py:
     54        (PortTestCase.test_build_driver):
     55
    1562015-03-05  Brent Fulgham  <bfulgham@apple.com>
    257

  • trunk/Tools/Scripts/webkitpy/common/config/ports.py

    r178641 r181093  
    133133    port_flag_name = "mac"
    134134
     135    def run_webkit_tests_command(self):
     136        command = super(MacPort, self).run_webkit_tests_command()
     137        command.append("--dump-render-tree")
     138        return command
    135139
    136140class MacWK2Port(DeprecatedPort):
    137141    port_flag_name = "mac-wk2"
    138 
    139     def run_webkit_tests_command(self):
    140         command = super(MacWK2Port, self).run_webkit_tests_command()
    141         command.append("-2")
    142         return command
    143142
    144143
    … …  
    148147    def run_bindings_tests_command(self):
    149148        return None
     149
     150    def run_webkit_tests_command(self):
     151        command = super(WinPort, self).run_webkit_tests_command()
     152        command.append("--dump-render-tree")
     153        return command
    150154
    151155
    … …  
    163167        command = super(GtkWK2Port, self).run_webkit_tests_command()
    164168        command.append("--gtk")
    165         command.append("-2")
    166169        return command
    167170

  • trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py

    r174136 r181093  
    3535    def test_mac_port(self):
    3636        self.assertEqual(MacPort().flag(), "--port=mac")
    37         self.assertEqual(MacPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests"))
     37        self.assertEqual(MacPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--dump-render-tree"])
    3838        self.assertEqual(MacPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit"))
    3939        self.assertEqual(MacPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug"])
    … …  
    4242    def test_gtk_wk2_port(self):
    4343        self.assertEqual(GtkWK2Port().flag(), "--port=gtk-wk2")
    44         self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
     44        self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk"])
    4545        self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
    4646        self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", DeprecatedPort().makeArgs()])

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

    r180238 r181093  
    123123        optparse.make_option("--threaded", action="store_true", default=False,
    124124            help="Run a concurrent JavaScript thread with each test"),
    125         optparse.make_option("--webkit-test-runner", "-2", action="store_true",
    126             help="Use WebKitTestRunner rather than DumpRenderTree."),
     125        optparse.make_option("--dump-render-tree", "-1", action="store_false", default=True, dest="webkit_test_runner",
     126            help="Use DumpRenderTree rather than WebKitTestRunner."),
    127127        # FIXME: We should merge this w/ --build-directory and only have one flag.
    128128        optparse.make_option("--root", action="store",

  • trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py

    r177471 r181093  
    538538        host = MockHost()
    539539        host.filesystem.write_text_file('/Users/mock/Library/Logs/DiagnosticReports/DumpRenderTree_2011-06-13-150719_quadzen.crash', mock_crash_report)
    540         _, regular_output, _ = logging_run(['failures/unexpected/crash-with-stderr.html'], tests_included=True, host=host)
     540        _, regular_output, _ = logging_run(['failures/unexpected/crash-with-stderr.html', '--dump-render-tree'], tests_included=True, host=host)
    541541        expected_crash_log = mock_crash_report
    542542        self.assertEqual(host.filesystem.read_text_file('/tmp/layout-test-results/failures/unexpected/crash-with-stderr-crash-log.txt'), expected_crash_log)

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

    r179553 r181093  
    116116            optparse.make_option("--test-results-server",
    117117                help="Upload the generated JSON file to the specified server when --output-json-path is present."),
    118             optparse.make_option("--webkit-test-runner", "-2", action="store_true",
    119                 help="Use WebKitTestRunner rather than DumpRenderTree."),
     118            optparse.make_option("--dump-render-tree", "-1", action="store_false", default=True, dest="webkit_test_runner",
     119                help="Use DumpRenderTree rather than WebKitTestRunner."),
    120120            optparse.make_option("--force", dest="use_skipped_list", action="store_false", default=True,
    121121                help="Run all tests, including the ones in the Skipped list."),

  • trunk/Tools/Scripts/webkitpy/port/port_testcase.py

    r179405 r181093  
    495495        self.assertTrue(output.assert_outputs(self, port._build_driver, expected_logs=expected_logs))
    496496
    497         # Make sure when passed --webkit-test-runner we build the right tool.
     497        # Make sure WebKitTestRunner is used.
    498498        port._options = MockOptions(webkit_test_runner=True, configuration="Release")
    499499        expected_logs = "MOCK run_command: ['Tools/Scripts/build-dumprendertree', '--release'], cwd=/mock-checkout, env={'LC_ALL': 'C', 'MOCK_ENVIRON_COPY': '1'}\nMOCK run_command: ['Tools/Scripts/build-webkittestrunner', '--release'], cwd=/mock-checkout, env={'LC_ALL': 'C', 'MOCK_ENVIRON_COPY': '1'}\n"
Note: See TracChangeset for help on using the changeset viewer.