Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'conditions': [ | 5 'conditions': [ |
| 6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { | 6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { |
|
Nico
2015/01/21 05:57:57
Is this false anywhere? ios?
jam
2015/01/21 06:00:05
the pak file isn't copied on ios. i'm not sure if
| |
| 7 'variables': { | 7 'variables': { |
| 8 'files': [ | 8 'files': [ |
| 9 'test/data/', | 9 'test/data/', |
| 10 '<(PRODUCT_DIR)/resources.pak', | 10 '<(PRODUCT_DIR)/components_unittests_resources.pak', |
| 11 ], | 11 ], |
| 12 }, | 12 }, |
| 13 }], | 13 }], |
| 14 ['OS=="linux" or OS=="mac" or OS=="win"', { | 14 ['OS=="linux" or OS=="mac" or OS=="win"', { |
| 15 'variables': { | 15 'variables': { |
| 16 'files': [ | 16 'files': [ |
| 17 '../testing/test_env.py', | 17 '../testing/test_env.py', |
| 18 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)', | 18 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)', |
| 19 ], | 19 ], |
| 20 }, | 20 }, |
| 21 }], | 21 }], |
| 22 ['OS=="android" or OS=="linux" or OS=="win"', { | 22 ['OS=="android" or OS=="linux" or OS=="win"', { |
| 23 'variables': { | 23 'variables': { |
| 24 'files': [ | 24 'files': [ |
| 25 '<(PRODUCT_DIR)/chrome_100_percent.pak', | |
| 26 '<(PRODUCT_DIR)/locales/en-US.pak', | |
| 27 ], | 25 ], |
| 28 }, | 26 }, |
| 29 }], | 27 }], |
|
Nico
2015/01/21 05:57:57
remove this block
jam
2015/01/21 06:00:05
yeah this was bugging me too, although at this poi
| |
| 30 ['OS=="linux"', { | 28 ['OS=="linux"', { |
| 31 'variables': { | 29 'variables': { |
| 32 'command': [ | 30 'command': [ |
| 33 '../testing/xvfb.py', | 31 '../testing/xvfb.py', |
| 34 '<(PRODUCT_DIR)', | 32 '<(PRODUCT_DIR)', |
| 35 '<(PRODUCT_DIR)/components_unittests', | 33 '<(PRODUCT_DIR)/components_unittests', |
| 36 '--brave-new-test-launcher', | 34 '--brave-new-test-launcher', |
| 37 '--test-launcher-bot-mode', | 35 '--test-launcher-bot-mode', |
| 38 '--asan=<(asan)', | 36 '--asan=<(asan)', |
| 39 '--lsan=<(lsan)', | 37 '--lsan=<(lsan)', |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 50 'variables': { | 48 'variables': { |
| 51 'command': [ | 49 'command': [ |
| 52 '../testing/test_env.py', | 50 '../testing/test_env.py', |
| 53 '<(PRODUCT_DIR)/components_unittests', | 51 '<(PRODUCT_DIR)/components_unittests', |
| 54 '--brave-new-test-launcher', | 52 '--brave-new-test-launcher', |
| 55 '--test-launcher-bot-mode', | 53 '--test-launcher-bot-mode', |
| 56 '--asan=<(asan)', | 54 '--asan=<(asan)', |
| 57 '--lsan=<(lsan)', | 55 '--lsan=<(lsan)', |
| 58 ], | 56 ], |
| 59 'files': [ | 57 'files': [ |
| 60 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', | 58 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', |
|
M-A Ruel
2015/01/21 13:55:45
Error was that on official build, components_unitt
jam
2015/01/21 15:12:15
ah, I missed this line. will remove in the reland.
| |
| 61 '<(PRODUCT_DIR)/ffmpegsumo.so', | 59 '<(PRODUCT_DIR)/ffmpegsumo.so', |
| 62 '<(PRODUCT_DIR)/osmesa.so', | 60 '<(PRODUCT_DIR)/osmesa.so', |
| 63 ], | 61 ], |
| 64 }, | 62 }, |
| 65 }], | 63 }], |
| 66 ['OS=="win"', { | 64 ['OS=="win"', { |
| 67 'variables': { | 65 'variables': { |
| 68 'command': [ | 66 'command': [ |
| 69 '../testing/test_env.py', | 67 '../testing/test_env.py', |
| 70 '<(PRODUCT_DIR)/components_unittests.exe', | 68 '<(PRODUCT_DIR)/components_unittests.exe', |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 85 'files': [ | 83 'files': [ |
| 86 '<(PRODUCT_DIR)/components_unittests.exe.pdb', | 84 '<(PRODUCT_DIR)/components_unittests.exe.pdb', |
| 87 ], | 85 ], |
| 88 }, | 86 }, |
| 89 }], | 87 }], |
| 90 ], | 88 ], |
| 91 'includes': [ | 89 'includes': [ |
| 92 '../base/base.isolate', | 90 '../base/base.isolate', |
| 93 ], | 91 ], |
| 94 } | 92 } |
| OLD | NEW |