summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 21:39:24 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-05 21:39:24 +0000
commit183abdd2b31ccd5852989b184ab7f9414dbbbe0a (patch)
treec7cb1a95e92ab609e4644180f03b495a80ec6419
parent71ae9ca0329b2c4f2ff2665bf7951b75f49c8ea5 (diff)
downloadchromium_src-183abdd2b31ccd5852989b184ab7f9414dbbbe0a.zip
chromium_src-183abdd2b31ccd5852989b184ab7f9414dbbbe0a.tar.gz
chromium_src-183abdd2b31ccd5852989b184ab7f9414dbbbe0a.tar.bz2
browser_tests.isolate on Windows: Trace 2 test cases but this should fix a few.
autogenerated with: python tools/isolate/isolate.py trace -r out/Release/browser_tests.results -- --gtest_filter=<test_case> python tools/isolate/isolate.py merge -r out/Release/browser_tests.results With <test_cases>: PerformanceMonitorBrowserTest.UpdateExtensionEvent PageCyclerCachedBrowserTest.PlaybackMode TBR=csharp@chromium.org NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/10917096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155029 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser_tests.isolate43
1 files changed, 42 insertions, 1 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index e4baa68..abb33a6 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -110,7 +110,6 @@
'<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/chrome.pak',
'<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/chrome_100_percent.pak',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/libppapi_tests.so',
@@ -940,6 +939,7 @@
'../net/data/ssl/certificates/ok_cert.pem',
'../net/data/ssl/certificates/root_ca_cert.crt',
'../third_party/WebKit/Tools/Scripts/new-run-webkit-websocketserver',
+ '<(PRODUCT_DIR)/chrome_100_percent.pak',
'<(PRODUCT_DIR)/locales/en-US.pak',
'<(PRODUCT_DIR)/test_data/chrome/test/data/webui/assertions.js',
'<(PRODUCT_DIR)/test_data/chrome/test/data/webui/chrome_send_browsertest.js',
@@ -1580,6 +1580,17 @@
'test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/french_sentence.html',
'test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/test_gettabs.js',
'test/data/extensions/good/Extensions/hpiknbiabeeppbpihjehijgoemciehgk/',
+ 'test/data/page_cycler/cached_data_dir/Default/Bookmarks',
+ 'test/data/page_cycler/cached_data_dir/Default/Bookmarks.bak',
+ 'test/data/page_cycler/cached_data_dir/Default/Favicons',
+ 'test/data/page_cycler/cached_data_dir/Default/Favicons-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/History',
+ 'test/data/page_cycler/cached_data_dir/Default/History-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/Preferences',
+ 'test/data/page_cycler/cached_data_dir/Default/Shortcuts',
+ 'test/data/page_cycler/cached_data_dir/Default/Shortcuts-journal',
+ 'test/data/page_cycler/cached_data_dir/chrome_shutdown_ms.txt',
+ 'test/data/page_cycler/cached_data_dir/urls',
'test/data/save_page/c.htm',
'third_party/jstemplate/jstemplate_compiled.js',
'tools/build/repack_locales.py',
@@ -1664,13 +1675,43 @@
'test/data/extensions/api_test/webnavigation/targetBlank/',
'test/data/extensions/api_test/webnavigation/userAction/',
'test/data/extensions/api_test/window_update/show_state/',
+ 'test/data/page_cycler/cached_data_dir/Default/Archived History',
+ 'test/data/page_cycler/cached_data_dir/Default/Archived History-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/Cache/',
+ 'test/data/page_cycler/cached_data_dir/Default/Current Session',
+ 'test/data/page_cycler/cached_data_dir/Default/Current Tabs',
+ 'test/data/page_cycler/cached_data_dir/Default/History Index 2011-12',
+ 'test/data/page_cycler/cached_data_dir/Default/History Index 2011-12-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/History Index 2012-02',
+ 'test/data/page_cycler/cached_data_dir/Default/History Index 2012-02-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/History Index 2012-03',
+ 'test/data/page_cycler/cached_data_dir/Default/History Index 2012-03-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/History Index 2012-04',
+ 'test/data/page_cycler/cached_data_dir/Default/History Index 2012-04-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/History Provider Cache',
+ 'test/data/page_cycler/cached_data_dir/Default/Last Session',
+ 'test/data/page_cycler/cached_data_dir/Default/Last Tabs',
+ 'test/data/page_cycler/cached_data_dir/Default/Network Action Predictor',
+ 'test/data/page_cycler/cached_data_dir/Default/Network Action Predictor-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/Top Sites',
+ 'test/data/page_cycler/cached_data_dir/Default/Top Sites-journal',
+ 'test/data/page_cycler/cached_data_dir/Default/Visited Links',
+ 'test/data/page_cycler/cached_data_dir/Default/Web Data',
+ 'test/data/page_cycler/cached_data_dir/Default/Web Data-journal',
+ 'test/data/page_cycler/cached_data_dir/Local State',
+ 'test/data/page_cycler/cached_data_dir/Safe Browsing Cookies',
+ 'test/data/page_cycler/cached_data_dir/Safe Browsing Cookies-journal',
+ 'test/data/performance_monitor/extensions/',
],
'isolate_dependency_touched': [
+ '<(PRODUCT_DIR)/First Run',
'test/data/download-test3.gif',
'test/data/empty.html',
'test/data/extensions/api_test/window_update/focus/blank.html',
'test/data/extensions/api_test/window_update/resize/blank.html',
'test/data/extensions/api_test/window_update/sizing/blank.html',
+ 'test/data/page_cycler/cached_data_dir/Default/User StyleSheets/Custom.css',
+ 'test/data/page_cycler/cached_data_dir/First Run',
],
},
}, {