summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 02:28:51 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 02:28:51 +0000
commit6305e67ec597ebf2b6a9b223c2196928a7dfef03 (patch)
tree864a983227a173a63c11cb7c2eefb70315428356 /chrome
parent043cc11910894f4bb2ae1c013d498964c6b84427 (diff)
downloadchromium_src-6305e67ec597ebf2b6a9b223c2196928a7dfef03.zip
chromium_src-6305e67ec597ebf2b6a9b223c2196928a7dfef03.tar.gz
chromium_src-6305e67ec597ebf2b6a9b223c2196928a7dfef03.tar.bz2
Unmark FLAKY on GpuFeatureTest.RafNoDamage because it has not failed.
Review URL: http://codereview.chromium.org/9694020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/gpu/gpu_feature_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 3ae618a..3ce86e9 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -376,8 +376,7 @@ IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, DISABLED_ThreadedCompositor) {
RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
}
-// TODO(jbates) unmark FLAKY once it's verified to not be flaky.
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, FLAKY_RafNoDamage) {
+IN_PROC_BROWSER_TEST_F(GpuFeatureTest, RafNoDamage) {
trace_categories_ = "-test_*";
const FilePath url(FILE_PATH_LITERAL("feature_raf_no_damage.html"));
RunTest(url, GpuResultFlags(0));
@@ -404,6 +403,7 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, FLAKY_RafNoDamage) {
// indicate that the renderer is not simply spinning on RAF.
EXPECT_GT(stats.mean_us, 15000.0);
+ // Print out the trace events upon error to debug failures.
if (stats.mean_us <= 15000.0) {
fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str());
}