base/base_unittests.isolate - Issue 813363003: Use Xvfb in isolated testing only if use_x11 is set

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: base/base_unittests.isolate

Issue 813363003: Use Xvfb in isolated testing only if use_x11 is set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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:

Index: base/base_unittests.isolate

diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate

index f561d209cf5920b95b36562e9edc01f0db678469..d8e460eef81e0b7a1363f55cfeb00678e75462c1 100644

--- a/base/base_unittests.isolate

+++ b/base/base_unittests.isolate

@@ -10,7 +10,7 @@

}],

- ['OS=="linux"', {

+ ['OS=="linux" and use_x11==1', {

'variables': {

'command': [

'../testing/xvfb.py',

@@ -23,12 +23,6 @@

'files': [

'../testing/xvfb.py',

- ],

- },

- }],

- ['OS=="linux" and use_ozone==0', {

- 'variables': {

- 'files': [

'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',

@@ -42,7 +36,7 @@

'read_only': 1,

}],

- ['OS=="mac" or OS=="win"', {

+ ['OS=="mac" or OS=="win" or use_ozone==1', {

'variables': {

'command': [

'../testing/test_env.py',