Convert compositor_unittests to run exclusively on Swarming

ui/compositor/compositor_unittests.isolate

Index: ui/compositor/compositor_unittests.isolate
diff --git a/ui/aura/aura_unittests.isolate b/ui/compositor/compositor_unittests.isolate
similarity index 61%
copy from ui/aura/aura_unittests.isolate
copy to ui/compositor/compositor_unittests.isolate
index 9e64db84278e87e7d93141c3eb9aa2aad0527988..8586bfbfd9abd6ec8fc258013adb3089da993afc 100644
--- a/ui/aura/aura_unittests.isolate
+++ b/ui/compositor/compositor_unittests.isolate
@@ -1,13 +1,13 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright (c) 2015 The Chromium Authors. All rights reserved.

[tfarina, 2015/07/03 02:01:59]

no (c)?

 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'conditions': [
-    ['use_x11==0', {
+    ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==0', {
       'variables': {
         'command': [
           '../../testing/test_env.py',
-          '<(PRODUCT_DIR)/aura_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/compositor_unittests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
@@ -16,12 +16,12 @@
         ],
       },
     }],
-    ['use_x11==1', {
+    ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==1', {

[M-A Ruel, 2015/07/03 01:53:45]

(OS=="linux" or OS=="mac" or OS=="win") is pointless in the sense that
use_x11==1 can only happen on linux, so we never test for the OS version there.

[Nico, 2015/07/03 02:00:50]

Yes, but I thought it looked more like the else to the previous block if the
condition is most similar. I'll change it if you want though.

       'variables': {
         'command': [
           '../../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/aura_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/compositor_unittests',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
@@ -30,7 +30,7 @@
         ],
         'files': [
           '../../testing/xvfb.py',
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/xdisplaycheck',
         ],
       },
     }],
@@ -38,30 +38,19 @@
       'variables': {
         'files': [
           '../../testing/test_env.py',
-          '<(PRODUCT_DIR)/aura_unittests<(EXECUTABLE_SUFFIX)',
+          '../gfx/test/data/compositor/',
+          '<(PRODUCT_DIR)/compositor_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/libosmesa.so',
-        ],
-      },
+      'variables': { 'files': [ '<(PRODUCT_DIR)/libosmesa.so' ] },
     }],
     ['OS=="mac"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/osmesa.so',
-        ],
-      },
+      'variables': { 'files': [ '<(PRODUCT_DIR)/osmesa.so' ] },
     }],
     ['OS=="win"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/osmesa.dll',
-        ],
-      },
+      'variables': { 'files': [ '<(PRODUCT_DIR)/osmesa.dll' ] },
     }],
   ],
   'includes': [