summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-28 11:58:53 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-28 11:58:53 +0000
commitff4d6a60cbc049df05537be100f879025d20fa6c (patch)
tree2a285b094e1a58c5e4ebfedb16ae5a2e3e3a4930
parent9f8548e3ba3c4048c9c44cade16a3fcd55b152f8 (diff)
downloadchromium_src-ff4d6a60cbc049df05537be100f879025d20fa6c.zip
chromium_src-ff4d6a60cbc049df05537be100f879025d20fa6c.tar.gz
chromium_src-ff4d6a60cbc049df05537be100f879025d20fa6c.tar.bz2
unit_tests.isolate on linux: Fix a few test cases.
I ran a few test cases manually with: python tools/isolate/isolate.py trace -r out/Release/unit_tests.results -- --gtest_filter=Foo.Bar python tools/isolate/isolate.py merge -r out/Release/unit_tests.results The most important change is chrome_100_percent.pak which should help a lot. TBR=cmp@chromium.org NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/10871095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153656 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/unit_tests.isolate10
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 4d7ddf7..0303f0d 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -377,6 +377,7 @@
'test/data/extensions/not_an_extension.crx',
'test/data/extensions/openssl_privkey_asn1.pem',
'test/data/extensions/page_action.crx',
+ 'test/data/extensions/permissions/audio-video.json',
'test/data/extensions/permissions/content_script_all_urls.json',
'test/data/extensions/permissions/content_script_file_scheme.json',
'test/data/extensions/permissions/content_script_http_scheme.json',
@@ -541,9 +542,15 @@
'../third_party/tlslite/tlslite/utils/PyCrypto_TripleDES.py',
'../third_party/tlslite/tlslite/utils/TripleDES.py',
'<(PRODUCT_DIR)/chrome.pak',
+ '<(PRODUCT_DIR)/chrome_100_percent.pak',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/pyproto/google/__init__.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+ 'test/data/extensions/api_test/webrequest/declarative/headers.html',
+ 'test/data/extensions/api_test/webrequest/declarative/headers.html.mock-http-headers',
+ 'test/data/extensions/extension_icon_image/16.png',
+ 'test/data/extensions/extension_icon_image/48.png',
+ 'test/data/extensions/extension_icon_image/app.json',
'test/data/extensions/unpacked/manifest_no_key.json',
'test/data/extensions/unpacked/manifest_with_key.json',
'test/data/extensions/unpacked/symlinks_allowed/manifest.json',
@@ -576,9 +583,6 @@
'../tools/isolate/run_test_cases.py',
'<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
],
- 'isolate_dependency_tracked': [
- 'test/data/extensions/permissions/audio-video.json',
- ],
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/test_data/chrome/browser/resources/print_preview/data/',
],