From 8a7be0714892c0c6360c45d0d602c119873b468e Mon Sep 17 00:00:00 2001
From: spang <spang@chromium.org>
Date: Wed, 7 Jan 2015 17:42:06 -0800
Subject: Use Xvfb in isolated testing only if use_x11 is set

We don't need a virtual X server for ozone testing, and it is causing
problems running the tests with swarming. This changes all isolate files
to only run Xvfb if use_x11==1 is set in GYP_DEFINES, and merges ozone
with Windows & Mac (none of which need to run their own display server).

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

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

Cr-Commit-Position: refs/heads/master@{#310434}
---
 chrome/interactive_ui_tests.isolate | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'chrome/interactive_ui_tests.isolate')

diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index bef0495..b008bb42 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -3,7 +3,18 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="linux"', {
+    ['use_x11==0', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+        ],
+      },
+    }],
+    ['use_x11==1', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
@@ -15,17 +26,17 @@
         ],
         'files': [
           '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/libosmesa.so',
-          '<(PRODUCT_DIR)/libppapi_tests.so',
-          '<(PRODUCT_DIR)/pyproto/google/',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux" and use_ozone==0', {
+    ['OS=="linux"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
+          '<(PRODUCT_DIR)/libppapi_tests.so',
+          '<(PRODUCT_DIR)/pyproto/google/',
         ],
       },
     }],
@@ -68,17 +79,6 @@
         ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
-          '--test-launcher-bot-mode',
-          '--asan=<(asan)',
-          '--lsan=<(lsan)',
-        ],
-      },
-    }],
     ['OS=="win"', {
       'variables': {
         'files': [
-- 
cgit v1.1