summaryrefslogtreecommitdiffstats
path: root/chrome/unit_tests.isolate
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 14:38:16 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-30 14:38:16 +0000
commit0b851eff6b7154e6818ca981a74c496ff9ac86ef (patch)
tree0c18984d1a32ea0a58594e0b3f330a25ba2477a2 /chrome/unit_tests.isolate
parent9567681130ca059c6529dc42d8cee12f155ac7de (diff)
downloadchromium_src-0b851eff6b7154e6818ca981a74c496ff9ac86ef.zip
chromium_src-0b851eff6b7154e6818ca981a74c496ff9ac86ef.tar.gz
chromium_src-0b851eff6b7154e6818ca981a74c496ff9ac86ef.tar.bz2
Fix Linux compile for swarm bots.
Also add a few missing files for unit_tests, found with fix_test_cases.py TBR=maruel@chromium.org NOTRY=True BUG= Review URL: https://chromiumcodereview.appspot.com/11346034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/unit_tests.isolate')
-rw-r--r--chrome/unit_tests.isolate12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 5f46457..a566781 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -229,6 +229,8 @@
'test/data/extensions/manifest_tests/hosted_app_absolute_options.json',
'test/data/extensions/manifest_tests/hosted_app_file_options.json',
'test/data/extensions/manifest_tests/hosted_app_relative_options.json',
+ 'test/data/extensions/manifest_tests/incognito_invalid_platform_app.json',
+ 'test/data/extensions/manifest_tests/incognito_valid_platform_app.json',
'test/data/extensions/manifest_tests/init_ignored_icon_size.json',
'test/data/extensions/manifest_tests/init_invalid_chrome_version_too_low.json',
'test/data/extensions/manifest_tests/init_invalid_description_invalid.json',
@@ -689,8 +691,6 @@
'isolate_dependency_tracked': [
'test/data/autofill/merge/input/ambiguous.in',
'test/data/autofill/merge/input/case.in',
- 'test/data/extensions/manifest_tests/incognito_invalid_platform_app.json',
- 'test/data/extensions/manifest_tests/incognito_valid_platform_app.json',
'test/data/extensions/permissions/platform_app_all_urls.json',
'test/data/extensions/permissions/platform_app_hosts.json',
'test/data/extensions/permissions/serial.json',
@@ -748,6 +748,10 @@
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/chrome_100_percent.pak',
'<(PRODUCT_DIR)/locales/en-US.pak',
+ 'test/data/extensions/manifest_tests/init_platform_app_csp.json',
+ 'test/data/extensions/manifest_tests/init_platform_app_csp_insecure.json',
+ 'test/data/extensions/manifest_tests/init_platform_app_csp_warning_1.json',
+ 'test/data/extensions/manifest_tests/init_platform_app_csp_warning_2.json',
],
'isolate_dependency_untracked': [
'test/data/firefox2_nss/',
@@ -909,10 +913,6 @@
'../third_party/python_26/python26.dll',
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/icudt.dll',
- 'test/data/extensions/manifest_tests/init_platform_app_csp.json',
- 'test/data/extensions/manifest_tests/init_platform_app_csp_insecure.json',
- 'test/data/extensions/manifest_tests/init_platform_app_csp_warning_1.json',
- 'test/data/extensions/manifest_tests/init_platform_app_csp_warning_2.json',
'test/data/safe_browsing/download_protection/signed.exe',
'test/data/safe_browsing/download_protection/unsigned.exe',
'test/data/safe_browsing/download_protection/wow_helper.exe',