summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 02:42:45 +0000
committersbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 02:42:45 +0000
commit5808fe1d4178a1c9a0d01701018ca41024aed865 (patch)
tree53dffec21aec19bcf28ea3ef3b165821225ec174 /chrome
parent682189baafa4ac5522e52b18438493b3a966c520 (diff)
downloadchromium_src-5808fe1d4178a1c9a0d01701018ca41024aed865.zip
chromium_src-5808fe1d4178a1c9a0d01701018ca41024aed865.tar.gz
chromium_src-5808fe1d4178a1c9a0d01701018ca41024aed865.tar.bz2
Disable failing ARM linux tests.
These tests all fail consistently on ARM linux. Bugs have been opened to get these fixed and re-enabled. BUG=238453,238459,238460,238467,238469,238490 Review URL: https://chromiumcodereview.appspot.com/15021004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/devtools/devtools_sanity_browsertest.cc3
-rw-r--r--chrome/browser/download/download_browsertest.cc7
-rw-r--r--chrome/browser/extensions/plugin_apitest.cc8
-rw-r--r--chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc11
4 files changed, 23 insertions, 6 deletions
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 1a7381e..e143d81 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -492,6 +492,9 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest,
#if defined(OS_WIN)
// Timing out on windows tryservers: http://crbug.com/219515
#define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
+// Timing out on linux ARM bot: https://crbug/238453
+#define MAYBE_TestPauseWhenScriptIsRunning DISABLED_TestPauseWhenScriptIsRunning
#else
#define MAYBE_TestPauseWhenScriptIsRunning TestPauseWhenScriptIsRunning
#endif
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 1e4a712..b8e57fc 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -2857,10 +2857,11 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_PauseResumeCancel) {
// quarantining files on Mac because it is not a cocoa app.
// TODO(benjhayden) test the equivalents on other platforms.
-// Test downloading a huge file and that PercentComplete is monotonic.
-
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
+// Timing out on ARM linux: http://crbug.com/238459
+#define MAYBE_DownloadTest_PercentComplete DISABLED_DownloadTest_PercentComplete
+#elif defined(OS_MACOSX)
// Disable on mac: http://crbug.com/238831
-#if defined(OS_MACOSX)
#define MAYBE_DownloadTest_PercentComplete DISABLED_DownloadTest_PercentComplete
#else
#define MAYBE_DownloadTest_PercentComplete DownloadTest_PercentComplete
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc
index 2ce850d..eb94d77 100644
--- a/chrome/browser/extensions/plugin_apitest.cc
+++ b/chrome/browser/extensions/plugin_apitest.cc
@@ -31,6 +31,9 @@ using extensions::Extension;
// ExtensionBrowserTest.PluginLoadUnload started failing after the switch to
// dynamic ASan runtime library on Mac. See http://crbug.com/234591.
#define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
+// Timing out on ARM linux http://crbug.com/238460
+#define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload
#else
#define MAYBE_PluginLoadUnload PluginLoadUnload
#endif
@@ -110,6 +113,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
// ExtensionBrowserTest.PluginPrivate started failing after the switch to
// dynamic ASan runtime library on Mac. See http://crbug.com/234591.
#define MAYBE_PluginPrivate DISABLED_PluginPrivate
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
+// Timing out on ARM linux http://crbug.com/238467
+#define MAYBE_PluginPrivate DISABLED_PluginPrivate
#else
#define MAYBE_PluginPrivate PluginPrivate
#endif
@@ -117,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginPrivate) {
if (!webkit::npapi::NPAPIPluginsSupported())
return;
-
+
browser()->profile()->GetPrefs()->SetBoolean(prefs::kPluginsAlwaysAuthorize,
true);
diff --git a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
index 71f04ed..c173df7 100644
--- a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
+++ b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
@@ -66,16 +66,23 @@ void NaClGdbDebugStubTest::RunDebugStubTest(const std::string& nacl_module,
// NaCl tests are disabled under ASAN because of qualification test.
#if defined(ADDRESS_SANITIZER)
# define MAYBE_Empty DISABLED_Empty
-# define MAYBE_Breakpoint DISABLED_Breakpoint
#else
# define MAYBE_Empty Empty
-# define MAYBE_Breakpoint Breakpoint
#endif
IN_PROC_BROWSER_TEST_F(NaClGdbDebugStubTest, MAYBE_Empty) {
RunDebugStubTest("Empty", "continue");
}
+#if defined(ADDRESS_SANITIZER)
+# define MAYBE_Breakpoint DISABLED_Breakpoint
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
+// Timing out on ARM linux: http://crbug.com/238469
+# define MAYBE_Breakpoint DISABLED_Breakpoint
+#else
+# define MAYBE_Breakpoint Breakpoint
+#endif
+
IN_PROC_BROWSER_TEST_F(NaClGdbDebugStubTest, MAYBE_Breakpoint) {
RunDebugStubTest("Empty", "breakpoint");
}