| Index: media/media_unittests.isolate
|
| diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate
|
| index 3a17689503d5f09cbc1d218fc985a4a50e292f75..cea8c33f800c756d18a1f542f17af717eed8a092 100644
|
| --- a/media/media_unittests.isolate
|
| +++ b/media/media_unittests.isolate
|
| @@ -15,33 +15,64 @@
|
| }],
|
| ['OS=="linux" or OS=="mac" or OS=="win"', {
|
| 'variables': {
|
| - 'command': [
|
| - '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
|
| - ],
|
| 'files': [
|
| + '../testing/test_env.py',
|
| '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
|
| ],
|
| },
|
| }],
|
| - # TODO(jmadill): should be automatic. http://crbug.com/418146
|
| - ['OS=="win"', {
|
| + ['OS=="linux"', {
|
| 'variables': {
|
| + 'command': [
|
| + '../testing/xvfb.py',
|
| + '<(PRODUCT_DIR)',
|
| + '<(PRODUCT_DIR)/media_unittests',
|
| + '--brave-new-test-launcher',
|
| + '--test-launcher-bot-mode',
|
| + '--asan=<(asan)',
|
| + '--lsan=<(lsan)',
|
| + ],
|
| 'files': [
|
| - '<(PRODUCT_DIR)/ffmpegsumo.dll',
|
| + '../testing/xvfb.py',
|
| + '<(PRODUCT_DIR)/libffmpegsumo.so',
|
| + '<(PRODUCT_DIR)/xdisplaycheck',
|
| ],
|
| },
|
| }],
|
| ['OS=="mac"', {
|
| 'variables': {
|
| + 'command': [
|
| + '../testing/test_env.py',
|
| + '<(PRODUCT_DIR)/media_unittests',
|
| + '--brave-new-test-launcher',
|
| + '--test-launcher-bot-mode',
|
| + '--asan=<(asan)',
|
| + '--lsan=<(lsan)',
|
| + ],
|
| 'files': [
|
| '<(PRODUCT_DIR)/ffmpegsumo.so',
|
| ],
|
| },
|
| }],
|
| - ['OS=="linux"', {
|
| + ['OS=="win"', {
|
| 'variables': {
|
| + 'command': [
|
| + '../testing/test_env.py',
|
| + '<(PRODUCT_DIR)/media_unittests.exe',
|
| + '--brave-new-test-launcher',
|
| + '--test-launcher-bot-mode',
|
| + '--asan=<(asan)',
|
| + '--lsan=<(lsan)',
|
| + ],
|
| 'files': [
|
| - '<(PRODUCT_DIR)/libffmpegsumo.so',
|
| + '<(PRODUCT_DIR)/ffmpegsumo.dll',
|
| + ],
|
| + },
|
| + }],
|
| + ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
|
| + 'variables': {
|
| + 'files': [
|
| + '<(PRODUCT_DIR)/media_unittests.exe.pdb',
|
| ],
|
| },
|
| }],
|
|
|