mojo/tools/mopy/gtest.py - Issue 1225673006: Revert of mandoline filesystem: Save cookie data to the mojo:filesystem.

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: mojo/tools/mopy/gtest.py

Issue 1225673006: Revert of mandoline filesystem: Save cookie data to the mojo:filesystem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sqlite-fs

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

Index: mojo/tools/mopy/gtest.py

diff --git a/mojo/tools/mopy/gtest.py b/mojo/tools/mopy/gtest.py

index 189ae067bd3c42bf2f442ac8294091b568bc4284..b72aad36c99f47a1f54389fc6827a110bf30e46b 100644

--- a/mojo/tools/mopy/gtest.py

+++ b/mojo/tools/mopy/gtest.py

@@ -133,11 +133,10 @@

"""Build the apptest command line. This value isn't executed on Android."""

paths = Paths(config)

# On Linux, always run tests with xvfb, but not for --gtest_list_tests.

- not_list_tests = not "--gtest_list_tests" in args

- use_xvfb = config.target_os == Config.OS_LINUX and not_list_tests

- xvfb_prefix = [paths.xvfb, paths.build_dir] if use_xvfb else []

- data_dir = ["--use-temporary-user-data-dir"] if not_list_tests else []

- return xvfb_prefix + [paths.mojo_runner] + data_dir + args + [apptest]

+ use_xvfb = (config.target_os == Config.OS_LINUX and

+ not "--gtest_list_tests" in args)

+ prefix = [paths.xvfb, paths.build_dir] if use_xvfb else []

+ return prefix + [paths.mojo_runner] + args + [apptest]

# TODO(msw): Determine proper test timeout durations (starting small).

« no previous file with comments | « mojo/services/network/network_service_delegate.cc ('k') | sql/mojo/mojo_vfs.cc » ('j') | no next file with comments »