Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Unified Diff: crypto/crypto_unittests.isolate

Issue 996173004: Convert more isolate files to respect use_x11 for Xvfb usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « components/components_unittests.isolate ('k') | extensions/extensions_browsertests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/crypto_unittests.isolate
diff --git a/crypto/crypto_unittests.isolate b/crypto/crypto_unittests.isolate
index 68ac6fa103c197fbb7a361991146e3c153c45e2e..93272b431ae0d1ce4ca2f725bacb6b15f3997a3c 100644
--- a/crypto/crypto_unittests.isolate
+++ b/crypto/crypto_unittests.isolate
@@ -3,7 +3,20 @@
# found in the LICENSE file.
{
'conditions': [
- ['OS=="linux"', {
+ ['use_x11==0', {
M-A Ruel 2015/03/11 18:31:35 This one probably doesn't need X but it's not a bi
+ 'variables': {
+ 'command': [
+ '../testing/test_env.py',
+ '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
+ '--brave-new-test-launcher',
+ '--test-launcher-bot-mode',
+ '--asan=<(asan)',
+ '--msan=<(msan)',
+ '--tsan=<(tsan)',
+ ],
+ },
+ }],
+ ['use_x11==1', {
'variables': {
'command': [
'../testing/xvfb.py',
@@ -36,19 +49,6 @@
'read_only': 1,
},
}],
- ['OS=="mac" or OS=="win"', {
- 'variables': {
- 'command': [
- '../testing/test_env.py',
- '<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
- '--brave-new-test-launcher',
- '--test-launcher-bot-mode',
- '--asan=<(asan)',
- '--msan=<(msan)',
- '--tsan=<(tsan)',
- ],
- },
- }],
['OS=="mac" and asan==1 and fastbuild==0', {
'variables': {
'files': [
« no previous file with comments | « components/components_unittests.isolate ('k') | extensions/extensions_browsertests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698