diff options
| author | Austin Hicks <camlorn@camlorn.net> | 2017-06-19 21:15:20 -0400 |
|---|---|---|
| committer | Austin Hicks <camlorn@camlorn.net> | 2017-06-20 10:09:29 -0400 |
| commit | f78dc9f613ec8788c894343955bfd376e260bb41 (patch) | |
| tree | 04f0893e0b91c51410361f52e8d30ddc9110e9ba | |
| parent | b2549bb6c4e512f3fcad9c450908616a1a8d1b5b (diff) | |
| download | servo-f78dc9f613ec8788c894343955bfd376e260bb41.tar.gz servo-f78dc9f613ec8788c894343955bfd376e260bb41.zip | |
Minimal changes to get WPT tests running on Windows.
| -rw-r--r-- | tests/wpt/grouping_formatter.py | 7 | ||||
| -rw-r--r-- | tests/wpt/harness/wptrunner/wptcommandline.py | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/wpt/grouping_formatter.py b/tests/wpt/grouping_formatter.py index 5bca29eec62..a02714b7068 100644 --- a/tests/wpt/grouping_formatter.py +++ b/tests/wpt/grouping_formatter.py @@ -7,6 +7,7 @@ import collections import os import sys import subprocess +import platform DEFAULT_MOVE_UP_CODE = u"\x1b[A" DEFAULT_CLEAR_EOL_CODE = u"\x1b[K" @@ -29,8 +30,12 @@ class GroupingFormatter(base.BaseFormatter): # TODO(mrobinson, 8313): We need to add support for Windows terminals here. if self.interactive: - self.line_width = int(subprocess.check_output(['stty', 'size']).split()[1]) self.move_up, self.clear_eol = self.get_move_up_and_clear_eol_codes() + if platform.system() != "Windows": + self.line_width = int(subprocess.check_output(['stty', 'size']).split()[1]) + else: + # Until we figure out proper Windows support, this makes things work well enough to run. + self.line_width = 80 self.expected = { 'OK': 0, diff --git a/tests/wpt/harness/wptrunner/wptcommandline.py b/tests/wpt/harness/wptrunner/wptcommandline.py index 38e7b8f5363..d7dd0534729 100644 --- a/tests/wpt/harness/wptrunner/wptcommandline.py +++ b/tests/wpt/harness/wptrunner/wptcommandline.py @@ -256,8 +256,10 @@ def exe_path(name): return path = find_executable(name) - if os.access(path, os.X_OK): + if path and os.access(path, os.X_OK): return path + else: + return None def check_args(kwargs): |