Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1355)

Unified Diff: cc/cc_unittests.isolate

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/debug/frame_timing_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/cc_unittests.isolate
diff --git a/gpu/gpu_unittests.isolate b/cc/cc_unittests.isolate
similarity index 67%
copy from gpu/gpu_unittests.isolate
copy to cc/cc_unittests.isolate
index 3380606ccdf2b81e3ee94240632edfeab37782dd..4e5ac92c966e1ec04dba0b49ae27fb0de3d654f8 100644
--- a/gpu/gpu_unittests.isolate
+++ b/cc/cc_unittests.isolate
@@ -6,8 +6,9 @@
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
+ 'test/data/',
'../testing/test_env.py',
- '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/cc_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
@@ -16,7 +17,7 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
- '<(PRODUCT_DIR)/gpu_unittests',
+ '<(PRODUCT_DIR)/cc_unittests',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
@@ -24,6 +25,14 @@
],
'files': [
'../testing/xvfb.py',
+ '<(PRODUCT_DIR)/libffmpegsumo.so',
+ '<(PRODUCT_DIR)/libosmesa.so',
+ ],
+ },
+ }],
+ ['OS=="linux" and use_ozone==0', {
+ 'variables': {
+ 'files': [
'<(PRODUCT_DIR)/xdisplaycheck',
],
},
@@ -32,30 +41,38 @@
'variables': {
'command': [
'../testing/test_env.py',
- '<(PRODUCT_DIR)/gpu_unittests',
+ '<(PRODUCT_DIR)/cc_unittests',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
+ 'files': [
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
+ '<(PRODUCT_DIR)/osmesa.so',
+ ],
},
}],
['OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
- '<(PRODUCT_DIR)/gpu_unittests.exe',
+ '<(PRODUCT_DIR)/cc_unittests.exe',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--lsan=<(lsan)',
],
+ 'files': [
+ '<(PRODUCT_DIR)/ffmpegsumo.dll',
+ '<(PRODUCT_DIR)/osmesa.dll',
+ ],
},
}],
['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
'files': [
- '<(PRODUCT_DIR)/gpu_unittests.exe.pdb',
+ '<(PRODUCT_DIR)/cc_unittests.exe.pdb',
],
},
}],
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/debug/frame_timing_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698