Changeset 92067 in webkit


Ignore:
Timestamp:
Jul 30, 2011 6:19:56 PM (13 years ago)
Author:
Patrick Gansterer
Message:

Fix ports_unittest.py on native windows
https://bugs.webkit.org/show_bug.cgi?id=64959

Reviewed by Adam Barth.

Replace WebKitPort.script_path with WebKitPort.script_shell_command.
The latter includes the interpreter executable required on native windows.

  • Scripts/webkitpy/common/config/ports_unittest.py:
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r92061 r92067  
     12011-07-30  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Fix ports_unittest.py on native windows
     4        https://bugs.webkit.org/show_bug.cgi?id=64959
     5
     6        Reviewed by Adam Barth.
     7
     8        Replace WebKitPort.script_path with WebKitPort.script_shell_command.
     9        The latter includes the interpreter executable required on native windows.
     10
     11        * Scripts/webkitpy/common/config/ports_unittest.py:
     12
    1132011-07-30  Adam Barth  <abarth@webkit.org>
    214
  • trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py

    r90864 r92067  
    3737        self.assertEquals(MacPort.name(), "Mac")
    3838        self.assertEquals(MacPort.flag(), "--port=mac")
    39         self.assertEquals(MacPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests")])
    40         self.assertEquals(MacPort.build_webkit_command(), [WebKitPort.script_path("build-webkit")])
    41         self.assertEquals(MacPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug"])
    42         self.assertEquals(MacPort.build_webkit_command(build_style="release"), [WebKitPort.script_path("build-webkit"), "--release"])
     39        self.assertEquals(MacPort.run_webkit_tests_command(), WebKitPort.script_shell_command("run-webkit-tests"))
     40        self.assertEquals(MacPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit"))
     41        self.assertEquals(MacPort.build_webkit_command(build_style="debug"), WebKitPort.script_shell_command("build-webkit") + ["--debug"])
     42        self.assertEquals(MacPort.build_webkit_command(build_style="release"), WebKitPort.script_shell_command("build-webkit") + ["--release"])
    4343
    4444        class TestIsLeopard(MacPort):
     
    5151        self.assertEquals(GtkPort.name(), "Gtk")
    5252        self.assertEquals(GtkPort.flag(), "--port=gtk")
    53         self.assertEquals(GtkPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests"), "--gtk"])
    54         self.assertEquals(GtkPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--gtk", WebKitPort.makeArgs()])
    55         self.assertEquals(GtkPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--gtk", WebKitPort.makeArgs()])
     53        self.assertEquals(GtkPort.run_webkit_tests_command(), WebKitPort.script_shell_command("run-webkit-tests") + ["--gtk"])
     54        self.assertEquals(GtkPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit") + ["--gtk", WebKitPort.makeArgs()])
     55        self.assertEquals(GtkPort.build_webkit_command(build_style="debug"), WebKitPort.script_shell_command("build-webkit") + ["--debug", "--gtk", WebKitPort.makeArgs()])
    5656
    5757    def test_qt_port(self):
    5858        self.assertEquals(QtPort.name(), "Qt")
    5959        self.assertEquals(QtPort.flag(), "--port=qt")
    60         self.assertEquals(QtPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests")])
    61         self.assertEquals(QtPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--qt", WebKitPort.makeArgs()])
    62         self.assertEquals(QtPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--qt", WebKitPort.makeArgs()])
     60        self.assertEquals(QtPort.run_webkit_tests_command(), WebKitPort.script_shell_command("run-webkit-tests"))
     61        self.assertEquals(QtPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit") + ["--qt", WebKitPort.makeArgs()])
     62        self.assertEquals(QtPort.build_webkit_command(build_style="debug"), WebKitPort.script_shell_command("build-webkit") + ["--debug", "--qt", WebKitPort.makeArgs()])
    6363
    6464    def test_chromium_port(self):
    6565        self.assertEquals(ChromiumPort.name(), "Chromium")
    6666        self.assertEquals(ChromiumPort.flag(), "--port=chromium")
    67         self.assertEquals(ChromiumPort.run_webkit_tests_command(), [WebKitPort.script_path("new-run-webkit-tests"), "--chromium", "--skip-failing-tests"])
    68         self.assertEquals(ChromiumPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--chromium", "--update-chromium"])
    69         self.assertEquals(ChromiumPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--chromium", "--update-chromium"])
    70         self.assertEquals(ChromiumPort.update_webkit_command(), [WebKitPort.script_path("update-webkit"), "--chromium"])
     67        self.assertEquals(ChromiumPort.run_webkit_tests_command(), WebKitPort.script_shell_command("new-run-webkit-tests") + ["--chromium", "--skip-failing-tests"])
     68        self.assertEquals(ChromiumPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit") + ["--chromium", "--update-chromium"])
     69        self.assertEquals(ChromiumPort.build_webkit_command(build_style="debug"), WebKitPort.script_shell_command("build-webkit") + ["--debug", "--chromium", "--update-chromium"])
     70        self.assertEquals(ChromiumPort.update_webkit_command(), WebKitPort.script_shell_command("update-webkit") + ["--chromium"])
    7171
    7272    def test_chromium_xvfb_port(self):
    73         self.assertEquals(ChromiumXVFBPort.run_webkit_tests_command(), ['xvfb-run', 'Tools/Scripts/new-run-webkit-tests', '--chromium', '--skip-failing-tests', '--results-directory=/tmp/layout-test-results', '--skip-failing-tests', '--print=actual,config,expected,misc,slowest,unexpected,unexpected-results'])
     73        self.assertEquals(ChromiumXVFBPort.run_webkit_tests_command(), ['xvfb-run'] + WebKitPort.script_shell_command('new-run-webkit-tests') + ['--chromium', '--skip-failing-tests', '--results-directory=/tmp/layout-test-results', '--skip-failing-tests', '--print=actual,config,expected,misc,slowest,unexpected,unexpected-results'])
    7474
    7575if __name__ == '__main__':
Note: See TracChangeset for help on using the changeset viewer.