Skip to content

GitLab

T
tangled
Commit c88a0abf authored by spang's avatar spang Committed by Commit bot
Browse files
Options

Convert more isolate files to respect use_x11 for Xvfb usage 

This is a followup to the update to disable Xvfb for OS=="linux"
use_x11==0 that converts additional targets.

BUG=440882
TEST=isolate.py run -s out_ozone/Debug/<various>
TBR=maruel

Review URL: https://codereview.chromium.org/996173004

Cr-Commit-Position: refs/heads/master@{#320143}
parent 8235d84d
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 179 deletions
cc/cc_unittests.isolate
View file @ c88a0abf
......@@ -3,16 +3,20 @@
# found in the LICENSE file.
{
'conditions': [
['OS=="linux" or OS=="mac" or OS=="win"', {
['use_x11==0', {
'variables': {
'files': [
'test/data/',
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="linux"', {
['use_x11==1', {
'variables': {
'command': [
'../testing/xvfb.py',
......@@ -26,29 +30,29 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck',
],
},
}],
['OS=="linux" and use_ozone==0', {
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck',
'test/data/',
'../testing/test_env.py',
'<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="mac"', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/cc_unittests',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
'files': [
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="mac"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/ffmpegsumo.so',
'<(PRODUCT_DIR)/osmesa.so',
......@@ -57,15 +61,6 @@
}],
['OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/cc_unittests.exe',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
'files': [
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/osmesa.dll',
......
components/components_browsertests.isolate
View file @ c88a0abf
......@@ -7,18 +7,20 @@
'../gin/v8.isolate',
],
'conditions': [
['OS=="linux" or OS=="mac" or OS=="win"', {
['use_x11==0', {
'variables': {
'files': [
'test/data/',
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/components_tests_resources.pak',
'<(PRODUCT_DIR)/content_shell.pak',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="linux"', {
['use_x11==1', {
'variables': {
'command': [
'../testing/xvfb.py',
......@@ -32,27 +34,25 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux" and use_ozone==0', {
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'test/data/',
'../testing/test_env.py',
'<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/components_tests_resources.pak',
'<(PRODUCT_DIR)/content_shell.pak',
],
},
}],
['OS=="mac" or OS=="win"', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
'files': [
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
......
components/components_unittests.isolate
View file @ c88a0abf
......@@ -3,23 +3,20 @@
# found in the LICENSE file.
{
'conditions': [
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
['use_x11==0', {
'variables': {
'files': [
'test/data/',
'<(PRODUCT_DIR)/components_tests_resources.pak',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="linux"', {
['use_x11==1', {
'variables': {
'command': [
'../testing/xvfb.py',
......@@ -33,23 +30,36 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck',
],
},
}],
['OS=="mac"', {
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'files': [
'test/data/',
'<(PRODUCT_DIR)/components_tests_resources.pak',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/components_unittests',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
'<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="mac"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/ffmpegsumo.so',
'<(PRODUCT_DIR)/osmesa.so',
......@@ -58,15 +68,6 @@
}],
['OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/components_unittests.exe',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
'files': [
'../chrome/test/data/policy/',
'<(PRODUCT_DIR)/ffmpegsumo.dll',
......
crypto/crypto_unittests.isolate
View file @ c88a0abf
......@@ -3,7 +3,20 @@
# found in the LICENSE file.
{
'conditions': [
['OS=="linux"', {
['use_x11==0', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['use_x11==1', {
'variables': {
'command': [
'../testing/xvfb.py',
......@@ -36,19 +49,6 @@
'read_only': 1,
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/crypto_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="mac" and asan==1 and fastbuild==0', {
'variables': {
'files': [
......
extensions/extensions_browsertests.isolate
View file @ c88a0abf
......@@ -3,22 +3,20 @@
# found in the LICENSE file.
{
'conditions': [
['OS=="linux" or OS=="mac" or OS=="win"', {
['use_x11==0', {
'variables': {
'files': [
'../net/data/',
'../net/tools/testserver/',
'command': [
'../testing/test_env.py',
'../third_party/pyftpdlib/',
'../third_party/pywebsocket/',
'../third_party/tlslite/',
'<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/extensions_shell_and_test.pak',
'test/data/',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="linux"', {
['use_x11==1', {
'variables': {
'command': [
'../testing/xvfb.py',
......@@ -32,27 +30,35 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'../net/data/',
'../net/tools/testserver/',
'../testing/test_env.py',
'../third_party/pyftpdlib/',
'../third_party/pywebsocket/',
'../third_party/tlslite/',
'<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/extensions_shell_and_test.pak',
'test/data/',
],
},
}],
['OS=="mac" or OS=="win"', {
['OS=="linux"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/extensions_browsertests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
'files': [
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
......
gpu/gpu_unittests.isolate
View file @ c88a0abf
......@@ -3,15 +3,20 @@
# found in the LICENSE file.
{
'conditions': [
['OS=="linux" or OS=="mac" or OS=="win"', {
['use_x11==0', {
'variables': {
'files': [
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="linux"', {
['use_x11==1', {
'variables': {
'command': [
'../testing/xvfb.py',
......@@ -29,29 +34,11 @@
],
},
}],
['OS=="mac"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/gpu_unittests',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="win"', {
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'files': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/gpu_unittests.exe',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
'<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
......
media/cast/cast_unittests.isolate
View file @ c88a0abf
......@@ -3,7 +3,20 @@
# found in the LICENSE file.
{
'conditions': [
['OS=="linux"', {
['use_x11==0', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['use_x11==1', {
'variables': {
'command': [
'../../testing/xvfb.py',
......@@ -17,14 +30,14 @@
],
'files': [
'../../testing/xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux" and use_ozone==0', {
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/libffmpegsumo.so',
],
},
}],
......@@ -43,19 +56,6 @@
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../../testing/test_env.py',
'<(PRODUCT_DIR)/cast_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="mac" and asan==1 and fastbuild==0', {
'variables': {
'files': [
......
media/media_unittests.isolate
View file @ c88a0abf
......@@ -6,22 +6,20 @@
'../base/base.isolate',
],
'conditions': [
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'test/data/',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
['use_x11==0', {
'variables': {
'files': [
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="linux"', {
['use_x11==1', {
'variables': {
'command': [
'../testing/xvfb.py',
......@@ -35,22 +33,34 @@
],
'files': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/xdisplaycheck',
],
},
}],
['OS=="mac"', {
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'files': [
'test/data/',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/media_unittests',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
'<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/libffmpegsumo.so',
],
},
}],
['OS=="mac"', {
'variables': {
'files': [
'<(PRODUCT_DIR)/ffmpegsumo.so',
],
......@@ -58,15 +68,6 @@
}],
['OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/media_unittests.exe',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
'files': [
'<(PRODUCT_DIR)/ffmpegsumo.dll',
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment