| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
|
| index 5e2212a8248a26942e7658613d8f6187e5fec9cf..a8b8fb641010036d4ed66da57560e157b6f8a35f 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
|
| @@ -58,9 +58,9 @@ def main(argv, stdout, stderr):
|
|
|
| try:
|
| port = host.port_factory.get(options.platform, options)
|
| - except (NotImplementedError, ValueError) as e:
|
| + except (NotImplementedError, ValueError) as error:
|
| # FIXME: is this the best way to handle unsupported port names?
|
| - print >> stderr, str(e)
|
| + print >> stderr, str(error)
|
| return test_run_results.UNEXPECTED_ERROR_EXIT_STATUS
|
|
|
| try:
|
| @@ -69,12 +69,12 @@ def main(argv, stdout, stderr):
|
| # We need to still handle KeyboardInterrupt, at least for webkitpy unittest cases.
|
| except KeyboardInterrupt:
|
| return test_run_results.INTERRUPTED_EXIT_STATUS
|
| - except test_run_results.TestRunException as e:
|
| - print >> stderr, e.msg
|
| - return e.code
|
| - except BaseException as e:
|
| - if isinstance(e, Exception):
|
| - print >> stderr, '\n%s raised: %s' % (e.__class__.__name__, str(e))
|
| + except test_run_results.TestRunException as error:
|
| + print >> stderr, error.msg
|
| + return error.code
|
| + except BaseException as error:
|
| + if isinstance(error, Exception):
|
| + print >> stderr, '\n%s raised: %s' % (error.__class__.__name__, error)
|
| traceback.print_exc(file=stderr)
|
| return test_run_results.UNEXPECTED_ERROR_EXIT_STATUS
|
|
|
|
|