summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 10:11:12 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 10:11:12 +0000
commit41e8daba7c80736e434a23164cf62e8999efe0b2 (patch)
treefce5af1232ecb247e3070defe4469b996411900b
parent1aec9a0131352882152eb788a674f8c08eda4679 (diff)
downloadchromium_src-41e8daba7c80736e434a23164cf62e8999efe0b2.zip
chromium_src-41e8daba7c80736e434a23164cf62e8999efe0b2.tar.gz
chromium_src-41e8daba7c80736e434a23164cf62e8999efe0b2.tar.bz2
Disable RecordApiTest.CheckPlayback under ASan
TBR=clintstaley BUG=130267 Review URL: https://chromiumcodereview.appspot.com/10448072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139519 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_record_api_test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_record_api_test.cc b/chrome/browser/extensions/extension_record_api_test.cc
index 9c5e786..f306a61 100644
--- a/chrome/browser/extensions/extension_record_api_test.cc
+++ b/chrome/browser/extensions/extension_record_api_test.cc
@@ -245,7 +245,13 @@ IN_PROC_BROWSER_TEST_F(RecordApiTest, CheckCapture) {
EXPECT_TRUE(VerifyURLHandling(result.get(), strategy));
}
-IN_PROC_BROWSER_TEST_F(RecordApiTest, CheckPlayback) {
+#if defined(ADDRESS_SANITIZER)
+// Times out under ASan, see http://crbug.com/130267.
+#define MAYBE_CheckPlayback DISABLED_CheckPlayback
+#else
+#define MAYBE_CheckPlayback CheckPlayback
+#endif
+IN_PROC_BROWSER_TEST_F(RecordApiTest, MAYBE_CheckPlayback) {
ScopedTempDir user_data_dir;
EXPECT_TRUE(user_data_dir.CreateUniqueTempDir());