build/android/pylib/instrumentation/test_runner.py - Issue 23681011: Android: splits cache_control and perf_control.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/instrumentation/test_runner.py

Issue 23681011: Android: splits cache_control and perf_control. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More files Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/android/pylib/instrumentation/test_runner.py

diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py

index c598e28d346c79d0450ff3344fc64e842c1842f8..21a5c459d955dad7d56d3d071deba8aee6a864a6 100644

--- a/build/android/pylib/instrumentation/test_runner.py

+++ b/build/android/pylib/instrumentation/test_runner.py

@@ -12,11 +12,11 @@ import time

from pylib import android_commands

from pylib import constants

from pylib import flag_changer

-from pylib import json_perf_parser

from pylib import perf_tests_helper

from pylib import valgrind_tools

from pylib.base import base_test_result

from pylib.base import base_test_runner

+from pylib.instrumentation import json_perf_parser

import test_result