summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-22 21:48:04 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-22 21:48:04 +0000
commit4f822e3150f526ae4734bbab2906d635d590e44c (patch)
treef6c7369931734cf9ca595ec87607cfa456439c05
parentb221a221aa6bea441ef4a6735b8c51551a708c10 (diff)
downloadchromium_src-4f822e3150f526ae4734bbab2906d635d590e44c.zip
chromium_src-4f822e3150f526ae4734bbab2906d635d590e44c.tar.gz
chromium_src-4f822e3150f526ae4734bbab2906d635d590e44c.tar.bz2
Skip SingleWindowDoesNotExceedLimit on Win Debug.
It times out on GPU win debug. BUG=171512 TEST= TBR=ccameron Review URL: https://codereview.chromium.org/12049027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178108 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/gpu/gpu_memory_test.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/gpu/gpu_memory_test.cc b/content/browser/gpu/gpu_memory_test.cc
index 9312651..d8d8610 100644
--- a/content/browser/gpu/gpu_memory_test.cc
+++ b/content/browser/gpu/gpu_memory_test.cc
@@ -15,6 +15,7 @@
#include "content/shell/shell.h"
#include "content/test/content_browser_test.h"
#include "content/test/content_browser_test_utils.h"
+#include "content/test/gpu/gpu_test_config.h"
#include "gpu/command_buffer/service/gpu_switches.h"
#include "net/base/net_util.h"
@@ -234,6 +235,10 @@ IN_PROC_BROWSER_TEST_F(GpuMemoryTest, SingleWindowDoesNotExceedLimit) {
if (!AllowTestsToRun())
return;
+ // crbug.com/171512, timeout on Win Debug.
+ if (GPUTestBotConfig::CurrentConfigMatches("WIN DEBUG"))
+ return;
+
content::Shell* tab = CreateNewTab();
LoadPage(tab, PAGE_CSS3D, kMemoryLimitMB);
// Make sure that the CSS3D page maxes out a single tab's budget (otherwise