diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 16:36:18 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 16:36:18 +0000 |
| commit | 5a30076859e0c3645e50fd234fe0699b3227398b (patch) | |
| tree | ae7d84a9599cdfcd4642a740498c83ec8fedbbaf /tools | |
| parent | e08f548d1b08252270811d905ee5f7d9d650b12f (diff) | |
| download | chromium_src-5a30076859e0c3645e50fd234fe0699b3227398b.zip chromium_src-5a30076859e0c3645e50fd234fe0699b3227398b.tar.gz chromium_src-5a30076859e0c3645e50fd234fe0699b3227398b.tar.bz2 | |
Fix exception handling.
Now if the trace generates an exception, it is properly printed.
TBR=cmp@chromium.org
NOTRY=true
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10703025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/isolate/isolate.py | 2 | ||||
| -rwxr-xr-x | tools/isolate/trace_inputs.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/isolate/isolate.py b/tools/isolate/isolate.py index 3011368..fda9952 100755 --- a/tools/isolate/isolate.py +++ b/tools/isolate/isolate.py @@ -701,7 +701,7 @@ def CMDread(args): except trace_inputs.TracingFailure, e: raise ExecutionError( 'Reading traces failed for: %s\n%s' % - (' '.join(complete_state.result.command, str(e)))) + (' '.join(complete_state.result.command), str(e))) return 0 diff --git a/tools/isolate/trace_inputs.py b/tools/isolate/trace_inputs.py index ee6e32e..cf0d7a8 100755 --- a/tools/isolate/trace_inputs.py +++ b/tools/isolate/trace_inputs.py @@ -2660,6 +2660,9 @@ def load_trace(logfile, root_dir, api, blacklist): """ data = api.parse_log(logfile, (blacklist or (lambda _: False))) assert len(data) == 1, 'More than one trace was detected!' + if 'exception' in data[0]: + # It got an exception, raise it. + raise data[0]['exception'] results = data[0]['results'] if root_dir: results = results.strip_root(root_dir) |