| Index: ui/aura/aura_unittests.isolate
|
| diff --git a/ui/touch_selection/ui_touch_selection_unittests.isolate b/ui/aura/aura_unittests.isolate
|
| similarity index 74%
|
| copy from ui/touch_selection/ui_touch_selection_unittests.isolate
|
| copy to ui/aura/aura_unittests.isolate
|
| index 3218fa4e7f8692f5abee5448145d1e925468e574..9e64db84278e87e7d93141c3eb9aa2aad0527988 100644
|
| --- a/ui/touch_selection/ui_touch_selection_unittests.isolate
|
| +++ b/ui/aura/aura_unittests.isolate
|
| @@ -1,4 +1,4 @@
|
| -# Copyright (c) 2014 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.
|
| {
|
| @@ -7,7 +7,7 @@
|
| 'variables': {
|
| 'command': [
|
| '../../testing/test_env.py',
|
| - '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
|
| + '<(PRODUCT_DIR)/aura_unittests<(EXECUTABLE_SUFFIX)',
|
| '--brave-new-test-launcher',
|
| '--test-launcher-bot-mode',
|
| '--asan=<(asan)',
|
| @@ -21,7 +21,7 @@
|
| 'command': [
|
| '../../testing/xvfb.py',
|
| '<(PRODUCT_DIR)',
|
| - '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
|
| + '<(PRODUCT_DIR)/aura_unittests<(EXECUTABLE_SUFFIX)',
|
| '--brave-new-test-launcher',
|
| '--test-launcher-bot-mode',
|
| '--asan=<(asan)',
|
| @@ -38,7 +38,7 @@
|
| 'variables': {
|
| 'files': [
|
| '../../testing/test_env.py',
|
| - '<(PRODUCT_DIR)/ui_touch_selection_unittests<(EXECUTABLE_SUFFIX)',
|
| + '<(PRODUCT_DIR)/aura_unittests<(EXECUTABLE_SUFFIX)',
|
| ],
|
| },
|
| }],
|
| @@ -49,10 +49,17 @@
|
| ],
|
| },
|
| }],
|
| - ['OS=="mac" and asan==1 and fastbuild==0', {
|
| + ['OS=="mac"', {
|
| 'variables': {
|
| 'files': [
|
| - '<(PRODUCT_DIR)/ui_touch_selection_unittests.dSYM/',
|
| + '<(PRODUCT_DIR)/osmesa.so',
|
| + ],
|
| + },
|
| + }],
|
| + ['OS=="win"', {
|
| + 'variables': {
|
| + 'files': [
|
| + '<(PRODUCT_DIR)/osmesa.dll',
|
| ],
|
| },
|
| }],
|
|
|