diff options
6 files changed, 56 insertions, 9 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"); } diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 7079ccd..c617db5 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -73,9 +73,17 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndClone) { ExpectTitle("OK"); } + +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) +// Timing out on ARM linux bot: http://crbug.com/238490 +#define MAYBE_CanSetupVideoCall DISABLED_CanSetupVideoCall +#else +#define MAYBE_CanSetupVideoCall CanSetupVideoCall +#endif + // These tests will make a complete PeerConnection-based call and verify that // video is playing for the call. -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CanSetupVideoCall) { +IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupVideoCall) { GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); NavigateToURL(shell(), url); @@ -143,9 +151,16 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) { ExpectTitle("OK"); } +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) +// Timing out on ARM linux bot: http://crbug.com/238490 +#define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia +#else +#define MAYBE_CallWithDataAndMedia CallWithDataAndMedia +#endif + // This test will make a PeerConnection-based call and test an unreliable text // dataChannel and audio and video tracks. -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) { +IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndMedia) { GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); NavigateToURL(shell(), url); @@ -165,6 +180,13 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, ExpectTitle("OK"); } +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) +// Timing out on ARM linux bot: http://crbug.com/238490 +#define MAYBE_CallWithNewVideoMediaStream DISABLED_CallWithNewVideoMediaStream +#else +#define MAYBE_CallWithNewVideoMediaStream CallWithNewVideoMediaStream +#endif + // This test will make a PeerConnection-based call and send a new Video // MediaStream that has been created based on a MediaStream created with // getUserMedia. diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index 4ee429f..1789da9 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc @@ -505,8 +505,16 @@ IN_PROC_BROWSER_TEST_F(WebRTCInternalsBrowserTest, ConvertedGraphs) { } } +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) +// Timing out on ARM linux bot: http://crbug.com/238490 +#define MAYBE_WithRealPeerConnectionCall DISABLED_WithRealPeerConnectionCall +#else +#define MAYBE_WithRealPeerConnectionCall WithRealPeerConnectionCall +#endif + // Sanity check of the page content under a real PeerConnection call. -IN_PROC_BROWSER_TEST_F(WebRTCInternalsBrowserTest, WithRealPeerConnectionCall) { +IN_PROC_BROWSER_TEST_F(WebRTCInternalsBrowserTest, + MAYBE_WithRealPeerConnectionCall) { // Start a peerconnection call in the first window. GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); NavigateToURL(shell(), url); |