scripts/slave/recipe_modules/chromium_android/api.py - Issue 892463002: Merged Android and non-Android code paths to reuse code in GTestTest

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: scripts/slave/recipe_modules/chromium_android/api.py

Issue 892463002: Merged Android and non-Android code paths to reuse code in GTestTest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Created 5 years, 11 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:

View side-by-side diff with in-line comments

Download patch

« scripts/slave/recipe_modules/chromium/steps.py ('K') | « scripts/slave/recipe_modules/chromium/steps.py ('k') | scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Tests.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipe_modules/chromium_android/api.py

diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py

index 330ae773934f6ee5df7cd4426eab9fe783c56cba..72f066b9ac612feea0e477cc290f1a6e70b0e7d8 100644

--- a/scripts/slave/recipe_modules/chromium_android/api.py

+++ b/scripts/slave/recipe_modules/chromium_android/api.py

@@ -627,8 +627,9 @@ class AndroidApi(recipe_api.RecipeApi):

def run_test_suite(self, suite, verbose=True, isolate_file_path=None,

gtest_filter=None, tool=None, flakiness_dashboard=None,

+ name=None, json_results_file=None, args=None,

**kwargs):

- args = []

+ args = args or []

if verbose:

args.append('--verbose')

if self.c.BUILD_CONFIG == 'Release':

@@ -642,9 +643,11 @@ class AndroidApi(recipe_api.RecipeApi):

if flakiness_dashboard:

args.append('--flakiness-dashboard-server=%s' %

flakiness_dashboard)

+ if json_results_file:

+ args.extend(['--json-results-file', json_results_file])

self.m.python(

- str(suite),

+ name or str(suite),

self.c.test_runner,

['gtest', '-s', suite] + args,

env=self.m.chromium.get_env(),