Index: chrome/test/gpu/webgl_conformance_test_list_autogen.h |
=================================================================== |
--- chrome/test/gpu/webgl_conformance_test_list_autogen.h (revision 113476) |
+++ chrome/test/gpu/webgl_conformance_test_list_autogen.h (working copy) |
@@ -9,6 +9,41 @@ |
#ifndef CHROME_TEST_GPU_WEBGL_CONFORMANCE_TEST_LIST_AUTOGEN_H_ |
#define CHROME_TEST_GPU_WEBGL_CONFORMANCE_TEST_LIST_AUTOGEN_H_ |
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) |
+#define MAYBE_conformance_textures_tex_input_validation DISABLED_conformance_textures_tex_input_validation |
+#elif !defined(MAYBE_conformance_textures_tex_input_validation) |
+#define MAYBE_conformance_textures_tex_input_validation conformance_textures_tex_input_validation |
+#endif |
+#if defined(OS_WIN) |
+#define MAYBE_conformance_glsl_functions_glsl_function_atan FAILS_conformance_glsl_functions_glsl_function_atan |
+#elif !defined(MAYBE_conformance_glsl_functions_glsl_function_atan) |
+#define MAYBE_conformance_glsl_functions_glsl_function_atan conformance_glsl_functions_glsl_function_atan |
+#endif |
+#if defined(OS_WIN) |
+#define MAYBE_conformance_glsl_functions_glsl_function_atan_xy FAILS_conformance_glsl_functions_glsl_function_atan_xy |
+#elif !defined(MAYBE_conformance_glsl_functions_glsl_function_atan_xy) |
+#define MAYBE_conformance_glsl_functions_glsl_function_atan_xy conformance_glsl_functions_glsl_function_atan_xy |
+#endif |
+#if defined(OS_WIN) |
+#define MAYBE_conformance_glsl_functions_glsl_function_mod_gentype FAILS_conformance_glsl_functions_glsl_function_mod_gentype |
+#elif !defined(MAYBE_conformance_glsl_functions_glsl_function_mod_gentype) |
+#define MAYBE_conformance_glsl_functions_glsl_function_mod_gentype conformance_glsl_functions_glsl_function_mod_gentype |
+#endif |
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) |
+#define MAYBE_conformance_more_functions_readPixelsBadArgs FAILS_conformance_more_functions_readPixelsBadArgs |
+#elif !defined(MAYBE_conformance_more_functions_readPixelsBadArgs) |
+#define MAYBE_conformance_more_functions_readPixelsBadArgs conformance_more_functions_readPixelsBadArgs |
+#endif |
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) |
+#define MAYBE_conformance_more_functions_texImage2DHTML FAILS_conformance_more_functions_texImage2DHTML |
+#elif !defined(MAYBE_conformance_more_functions_texImage2DHTML) |
+#define MAYBE_conformance_more_functions_texImage2DHTML conformance_more_functions_texImage2DHTML |
+#endif |
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) |
+#define MAYBE_conformance_more_functions_texSubImage2DHTML FAILS_conformance_more_functions_texSubImage2DHTML |
+#elif !defined(MAYBE_conformance_more_functions_texSubImage2DHTML) |
+#define MAYBE_conformance_more_functions_texSubImage2DHTML conformance_more_functions_texSubImage2DHTML |
+#endif |
CONFORMANCE_TEST(conformance_more_conformance_constants, |
"conformance/more/conformance/constants.html"); |
CONFORMANCE_TEST(conformance_more_conformance_getContext, |
@@ -73,13 +108,13 @@ |
"conformance/more/functions/isTests.html"); |
CONFORMANCE_TEST(conformance_more_functions_readPixels, |
"conformance/more/functions/readPixels.html"); |
-CONFORMANCE_TEST(FAILS_conformance_more_functions_readPixelsBadArgs, |
+CONFORMANCE_TEST(MAYBE_conformance_more_functions_readPixelsBadArgs, |
"conformance/more/functions/readPixelsBadArgs.html"); |
CONFORMANCE_TEST(conformance_more_functions_texImage2D, |
"conformance/more/functions/texImage2D.html"); |
CONFORMANCE_TEST(conformance_more_functions_texImage2DBadArgs, |
"conformance/more/functions/texImage2DBadArgs.html"); |
-CONFORMANCE_TEST(FAILS_conformance_more_functions_texImage2DHTML, |
+CONFORMANCE_TEST(MAYBE_conformance_more_functions_texImage2DHTML, |
"conformance/more/functions/texImage2DHTML.html"); |
CONFORMANCE_TEST(conformance_more_functions_texImage2DHTMLBadArgs, |
"conformance/more/functions/texImage2DHTMLBadArgs.html"); |
@@ -87,7 +122,7 @@ |
"conformance/more/functions/texSubImage2D.html"); |
CONFORMANCE_TEST(conformance_more_functions_texSubImage2DBadArgs, |
"conformance/more/functions/texSubImage2DBadArgs.html"); |
-CONFORMANCE_TEST(FAILS_conformance_more_functions_texSubImage2DHTML, |
+CONFORMANCE_TEST(MAYBE_conformance_more_functions_texSubImage2DHTML, |
"conformance/more/functions/texSubImage2DHTML.html"); |
CONFORMANCE_TEST(conformance_more_functions_texSubImage2DHTMLBadArgs, |
"conformance/more/functions/texSubImage2DHTMLBadArgs.html"); |
@@ -289,7 +324,7 @@ |
"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(MAYBE_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"); |
@@ -345,9 +380,9 @@ |
"conformance/glsl/functions/glsl-function-acos.html"); |
CONFORMANCE_TEST(conformance_glsl_functions_glsl_function_asin, |
"conformance/glsl/functions/glsl-function-asin.html"); |
-CONFORMANCE_TEST(FAILS_conformance_glsl_functions_glsl_function_atan, |
+CONFORMANCE_TEST(MAYBE_conformance_glsl_functions_glsl_function_atan, |
"conformance/glsl/functions/glsl-function-atan.html"); |
-CONFORMANCE_TEST(FAILS_conformance_glsl_functions_glsl_function_atan_xy, |
+CONFORMANCE_TEST(MAYBE_conformance_glsl_functions_glsl_function_atan_xy, |
"conformance/glsl/functions/glsl-function-atan-xy.html"); |
CONFORMANCE_TEST(conformance_glsl_functions_glsl_function_ceil, |
"conformance/glsl/functions/glsl-function-ceil.html"); |
@@ -385,7 +420,7 @@ |
"conformance/glsl/functions/glsl-function-mix-gentype.html"); |
CONFORMANCE_TEST(conformance_glsl_functions_glsl_function_mod_float, |
"conformance/glsl/functions/glsl-function-mod-float.html"); |
-CONFORMANCE_TEST(FAILS_conformance_glsl_functions_glsl_function_mod_gentype, |
+CONFORMANCE_TEST(MAYBE_conformance_glsl_functions_glsl_function_mod_gentype, |
"conformance/glsl/functions/glsl-function-mod-gentype.html"); |
CONFORMANCE_TEST(conformance_glsl_functions_glsl_function_normalize, |
"conformance/glsl/functions/glsl-function-normalize.html"); |