Add "isolate" for content_unittests.
BUG=
Review URL: https://codereview.chromium.org/27714002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230187 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 1fce231..2c6f6a57 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -795,6 +795,24 @@
},
],
'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'content_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'content_unittests',
+ ],
+ 'includes': [
+ '../build/isolate.gypi',
+ 'content_unittests.isolate',
+ ],
+ 'sources': [
+ 'content_unittests.isolate',
+ ],
+ },
+ ],
+ }],
['OS!="ios"', {
'targets': [
{
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index b39101c7..780aefb 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -12,13 +12,24 @@
],
},
}],
- ['OS=="android" or OS=="mac"', {
+ ['OS=="android" or OS=="mac" or OS=="win"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/content_resources.pak',
],
},
}],
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '../testing/test_env.py',
+ '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
+ ],
+ 'isolate_dependency_untracked': [
+ '../tools/swarm_client/',
+ ],
+ },
+ }],
['OS=="linux"', {
'variables': {
'command': [
@@ -28,42 +39,33 @@
'<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
+ '../testing/xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so',
- ],
- 'isolate_dependency_untracked': [
- '<(PRODUCT_DIR)/test_data/',
- ],
- },
- }],
- ['OS=="linux" or OS=="mac" or OS=="win"', {
- 'variables': {
- 'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
- ],
- 'isolate_dependency_untracked': [
- '../tools/swarm_client/',
+ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="mac"', {
'variables': {
- 'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/ffmpegsumo.so',
- ],
- },
- }],
- ['OS=="mac" or OS=="win"', {
- 'variables': {
'command': [
'../testing/test_env.py',
'../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
],
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
+ ],
},
}],
['OS=="win"', {
'variables': {
+ 'command': [
+ '../testing/test_env.py',
+ '../tools/swarm_client/googletest/run_test_cases.py',
+ '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
+ ],
'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/aura_test_support_resources.pak',
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/icudt.dll',
],
