From c88a0abfe3d8ce136bdcef4b6f7f537df89bf72d Mon Sep 17 00:00:00 2001
From: spang <spang@chromium.org>
Date: Wed, 11 Mar 2015 13:51:53 -0700
Subject: Convert more isolate files to respect use_x11 for Xvfb usage

This is a followup to the update to disable Xvfb for OS=="linux"
use_x11==0 that converts additional targets.

BUG=440882
TEST=isolate.py run -s out_ozone/Debug/<various>
TBR=maruel

Review URL: https://codereview.chromium.org/996173004

Cr-Commit-Position: refs/heads/master@{#320143}
---
 cc/cc_unittests.isolate | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

(limited to 'cc/cc_unittests.isolate')

diff --git a/cc/cc_unittests.isolate b/cc/cc_unittests.isolate
index eab3396..dc6c449 100644
--- a/cc/cc_unittests.isolate
+++ b/cc/cc_unittests.isolate
@@ -3,16 +3,20 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['use_x11==0', {
       'variables': {
-        'files': [
-          'test/data/',
+        'command': [
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--msan=<(msan)',
+          '--tsan=<(tsan)',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['use_x11==1', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
@@ -26,29 +30,29 @@
         ],
         'files': [
           '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/xdisplaycheck',
         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck',
+          'test/data/',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="mac"', {
+    ['OS=="linux"', {
       'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/cc_unittests',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
+        'files': [
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
         ],
+      },
+    }],
+    ['OS=="mac"', {
+      'variables': {
         'files': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
           '<(PRODUCT_DIR)/osmesa.so',
@@ -57,15 +61,6 @@
     }],
     ['OS=="win"', {
       'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/cc_unittests.exe',
-          '--brave-new-test-launcher',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--msan=<(msan)',
-          '--tsan=<(tsan)',
-        ],
         'files': [
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/osmesa.dll',
-- 
cgit v1.1