Chromium Code Reviews| Index: cc/cc_unittests.isolate |
| diff --git a/content/content_unittests.isolate b/cc/cc_unittests.isolate |
| similarity index 60% |
| copy from content/content_unittests.isolate |
| copy to cc/cc_unittests.isolate |
| index bc982e2c3dd9239f34ab680f63ffd9ee6528bf8b..89d7e06b0e83a48b571b98e441c5e6b1c3de5bdd 100644 |
| --- a/content/content_unittests.isolate |
| +++ b/cc/cc_unittests.isolate |
| @@ -1,35 +1,14 @@ |
| -# Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| +# Copyright 2015 The Chromium Authors. All rights reserved. |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| { |
| 'conditions': [ |
| - ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { |
| - 'variables': { |
| - 'files': [ |
| - '../media/test/data/', |
| - 'test/data/', |
| - ], |
| - }, |
| - }], |
| - ['OS=="android"', { |
| - 'variables': { |
| - 'files': [ |
| - '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', |
| - ], |
| - }, |
| - }], |
| - ['OS=="linux" or OS=="mac" or OS=="win"', { |
| - 'variables': { |
| - 'files': [ |
| - '<(PRODUCT_DIR)/content_shell.pak', |
| - ], |
| - }, |
| - }], |
| ['OS=="linux" or OS=="mac" or OS=="win"', { |
| 'variables': { |
| 'files': [ |
| + 'test/data/', |
| '../testing/test_env.py', |
| - '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', |
| + '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)', |
| ], |
| }, |
| }], |
| @@ -38,7 +17,7 @@ |
| 'command': [ |
| '../testing/xvfb.py', |
| '<(PRODUCT_DIR)', |
| - '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', |
| + '<(PRODUCT_DIR)/cc_unittests', |
| '--brave-new-test-launcher', |
| '--test-launcher-bot-mode', |
| '--asan=<(asan)', |
| @@ -48,13 +27,7 @@ |
| '../testing/xvfb.py', |
| '<(PRODUCT_DIR)/libffmpegsumo.so', |
| '<(PRODUCT_DIR)/libosmesa.so', |
| - ], |
| - }, |
| - }], |
| - ['OS=="linux" and use_ozone==0', { |
| - 'variables': { |
| - 'files': [ |
| - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
| + '<(PRODUCT_DIR)/xdisplaycheck', |
|
M-A Ruel
2015/01/15 23:39:17
Someone had been switching this condition on use_x
jam
2015/01/16 00:03:15
ah, I had removed it since ozone isn't using swarm
M-A Ruel
2015/01/16 00:16:37
Maybe it had broken compile? I don't mind really,
|
| ], |
| }, |
| }], |
| @@ -62,7 +35,7 @@ |
| 'variables': { |
| 'command': [ |
| '../testing/test_env.py', |
| - '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', |
| + '<(PRODUCT_DIR)/cc_unittests', |
| '--brave-new-test-launcher', |
| '--test-launcher-bot-mode', |
| '--asan=<(asan)', |
| @@ -78,7 +51,7 @@ |
| 'variables': { |
| 'command': [ |
| '../testing/test_env.py', |
| - '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', |
| + '<(PRODUCT_DIR)/content_unittests.exe', |
| '--brave-new-test-launcher', |
| '--test-launcher-bot-mode', |
| '--asan=<(asan)', |
| @@ -93,13 +66,12 @@ |
| ['OS=="win" and (fastbuild==0 or fastbuild==1)', { |
| 'variables': { |
| 'files': [ |
| - '<(PRODUCT_DIR)/content_unittests.exe.pdb', |
| + '<(PRODUCT_DIR)/cc_unittests.exe.pdb', |
| ], |
| }, |
| }], |
| ], |
| 'includes': [ |
| '../base/base.isolate', |
| - '../gin/v8.isolate', |
| ], |
| } |