summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/gpu/webgl_conformance_test_expectations.txt2
-rw-r--r--chrome/test/gpu/webgl_conformance_test_list_autogen.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/chrome/test/gpu/webgl_conformance_test_expectations.txt b/chrome/test/gpu/webgl_conformance_test_expectations.txt
index d551eb6..748275c 100644
--- a/chrome/test/gpu/webgl_conformance_test_expectations.txt
+++ b/chrome/test/gpu/webgl_conformance_test_expectations.txt
@@ -20,8 +20,6 @@
// TIMEOUT TESTS
// -----------------------------------------------------------------------------
-103804 MAC WIN LINUX : conformance_textures_tex_input_validation = TIMEOUT
-
// -----------------------------------------------------------------------------
// FAILING TESTS
// -----------------------------------------------------------------------------
diff --git a/chrome/test/gpu/webgl_conformance_test_list_autogen.h b/chrome/test/gpu/webgl_conformance_test_list_autogen.h
index cac5a84..4872ca6 100644
--- a/chrome/test/gpu/webgl_conformance_test_list_autogen.h
+++ b/chrome/test/gpu/webgl_conformance_test_list_autogen.h
@@ -289,7 +289,7 @@ CONFORMANCE_TEST(conformance_textures_tex_image_with_format_and_type,
"conformance/textures/tex-image-with-format-and-type.html");
CONFORMANCE_TEST(conformance_textures_tex_image_with_invalid_data,
"conformance/textures/tex-image-with-invalid-data.html");
-CONFORMANCE_TEST(DISABLED_conformance_textures_tex_input_validation,
+CONFORMANCE_TEST(conformance_textures_tex_input_validation,
"conformance/textures/tex-input-validation.html");
CONFORMANCE_TEST(conformance_textures_tex_sub_image_2d_bad_args,
"conformance/textures/tex-sub-image-2d-bad-args.html");