| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Wrapper around | 6 """Wrapper around |
| 7 third_party/WebKit/WebKitTools/Scripts/new-run-webkit-tests""" | 7 third_party/WebKit/WebKitTools/Scripts/new-run-webkit-tests""" |
| 8 import os | 8 import os |
| 9 import subprocess | 9 import subprocess |
| 10 import sys | 10 import sys |
| 11 | 11 |
| 12 def main(): | 12 def main(): |
| 13 if sys.platform == 'cygwin': |
| 14 return( |
| 15 'ERROR: you are running from cygwin python, which is not\n' |
| 16 ' supported by "run_webkit_test.py". You should use python\n' |
| 17 ' for Windows (2.5+) to launch this script. A python for\n' |
| 18 ' Windows can be found at your depot_tools folder:\n' |
| 19 ' [DEPOT_TOOLS_PATH]/python ' + '"' + sys.argv[0] + '" ' + |
| 20 ' '.join(sys.argv[1:])) |
| 21 |
| 13 cmd = [sys.executable] | 22 cmd = [sys.executable] |
| 14 src_dir=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname( | 23 src_dir=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname( |
| 15 os.path.dirname(os.path.abspath(sys.argv[0])))))) | 24 os.path.dirname(os.path.abspath(sys.argv[0])))))) |
| 16 script_dir=os.path.join(src_dir, "third_party", "WebKit", "WebKitTools", | 25 script_dir=os.path.join(src_dir, "third_party", "WebKit", "WebKitTools", |
| 17 "Scripts") | 26 "Scripts") |
| 18 script = os.path.join(script_dir, 'new-run-webkit-tests') | 27 script = os.path.join(script_dir, 'new-run-webkit-tests') |
| 19 cmd.append(script) | 28 cmd.append(script) |
| 20 if '--chromium' not in sys.argv: | 29 if '--chromium' not in sys.argv: |
| 21 cmd.append('--chromium') | 30 cmd.append('--chromium') |
| 22 cmd.extend(sys.argv[1:]) | 31 cmd.extend(sys.argv[1:]) |
| 23 return subprocess.call(cmd) | 32 return subprocess.call(cmd) |
| 24 | 33 |
| 25 if __name__ == '__main__': | 34 if __name__ == '__main__': |
| 26 sys.exit(main()) | 35 sys.exit(main()) |
| 27 | 36 |
| OLD | NEW |