| OLD | NEW |
|---|
| 1 # Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2014 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=="linux" or OS=="mac" or OS=="win"', { | 6 ['OS=="linux" or OS=="mac" or OS=="win"', { |
| 7 'variables': { | 7 'variables': { |
| 8 'files': [ | 8 'files': [ |
| 9 '../../testing/test_env.py', | 9 '../../testing/test_env.py', |
| 10 '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', | 10 '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', |
| 11 ], | 11 ], |
| 12 }, | 12 }, |
| 13 }], | 13 }], |
| 14 ['OS=="linux"', { | 14 ['use_x11==0', { |
| 15 'variables': { |
| 16 'command': [ |
| 17 '../../testing/test_env.py', |
| 18 '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', |
| 19 '--brave-new-test-launcher', |
| 20 '--test-launcher-bot-mode', |
| 21 '--asan=<(asan)', |
| 22 '--lsan=<(lsan)', |
| 23 ], |
| 24 }, |
| 25 }], |
| 26 ['use_x11==1', { |
| 15 'variables': { | 27 'variables': { |
| 16 'command': [ | 28 'command': [ |
| 17 '../../testing/xvfb.py', | 29 '../../testing/xvfb.py', |
| 18 '<(PRODUCT_DIR)', | 30 '<(PRODUCT_DIR)', |
| 19 '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', | 31 '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', |
| 20 '--brave-new-test-launcher', | 32 '--brave-new-test-launcher', |
| 21 '--test-launcher-bot-mode', | 33 '--test-launcher-bot-mode', |
| 22 '--asan=<(asan)', | 34 '--asan=<(asan)', |
| 23 '--lsan=<(lsan)', | 35 '--lsan=<(lsan)', |
| 24 ], | 36 ], |
| 25 'files': [ | 37 'files': [ |
| 26 '../../testing/xvfb.py', | 38 '../../testing/xvfb.py', |
| 27 '<(PRODUCT_DIR)/libosmesa.so', | 39 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
| 28 ], | 40 ], |
| 29 }, | 41 }, |
| 30 }], | 42 }], |
| 31 ['OS=="linux" and use_ozone==0', { | 43 ['OS=="linux" and use_ozone==0', { |
| 32 'variables': { | 44 'variables': { |
| 33 'files': [ | 45 'files': [ |
| 34 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', | 46 '<(PRODUCT_DIR)/libosmesa.so', |
| 35 ], | 47 ], |
| 36 }, | 48 }, |
| 37 }], | 49 }], |
| 38 ['OS=="mac"', { | 50 ['OS=="mac"', { |
| 39 'variables': { | 51 'variables': { |
| 40 'files': [ | 52 'files': [ |
| 41 '<(PRODUCT_DIR)/osmesa.so', | 53 '<(PRODUCT_DIR)/osmesa.so', |
| 42 ], | 54 ], |
| 43 }, | 55 }, |
| 44 }], | 56 }], |
| 45 ['OS=="win"', { | 57 ['OS=="win"', { |
| 46 'variables': { | 58 'variables': { |
| 47 'files': [ | 59 'files': [ |
| 48 '<(PRODUCT_DIR)/osmesa.dll', | 60 '<(PRODUCT_DIR)/osmesa.dll', |
| 49 ], | 61 ], |
| 50 }, | 62 }, |
| 51 }], | 63 }], |
| 52 ['OS=="mac" or OS=="win"', { | |
| 53 'variables': { | |
| 54 'command': [ | |
| 55 '../../testing/test_env.py', | |
| 56 '<(PRODUCT_DIR)/events_unittests<(EXECUTABLE_SUFFIX)', | |
| 57 '--brave-new-test-launcher', | |
| 58 '--test-launcher-bot-mode', | |
| 59 '--asan=<(asan)', | |
| 60 '--lsan=<(lsan)', | |
| 61 ], | |
| 62 }, | |
| 63 }], | |
| 64 ], | 64 ], |
| 65 'includes': [ | 65 'includes': [ |
| 66 '../../base/base.isolate', | 66 '../../base/base.isolate', |
| 67 ], | 67 ], |
| 68 } | 68 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 813363003:
Use Xvfb in isolated testing only if use_x11 is set (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master