summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-02 10:33:09 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-02 10:33:09 +0000
commit28505fc1b3491a7036e36d0d4e0e207533ef204e (patch)
tree4f1163138a1e8950710d8e3482c1cd3cdbcdca20
parenteeca0b31fdd3a366d4ba00a9d5555060d4bdb9d7 (diff)
downloadchromium_src-28505fc1b3491a7036e36d0d4e0e207533ef204e.zip
chromium_src-28505fc1b3491a7036e36d0d4e0e207533ef204e.tar.gz
chromium_src-28505fc1b3491a7036e36d0d4e0e207533ef204e.tar.bz2
Disable AppApiTest.ReloadIntoAppProcess under AddressSanitizer
BUG=103371 TBR=nasko Review URL: https://chromiumcodereview.appspot.com/10310004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134887 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/app_process_apitest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 34a28db..f4acf5b 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -404,7 +404,14 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) {
// Ensure that reloading a URL after installing or uninstalling it as an app
// correctly swaps the process. (http://crbug.com/80621)
-IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) {
+//
+// The test times out under AddressSanitizer, see http://crbug.com/103371
+#if defined(ADDRESS_SANITIZER)
+#define MAYBE_ReloadIntoAppProcess DISABLED_ReloadIntoAppProcess
+#else
+#define MAYBE_ReloadIntoAppProcess ReloadIntoAppProcess
+#endif
+IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
extensions::ProcessMap* process_map =
browser()->profile()->GetExtensionService()->process_map();