commit e3a565c6effc03fe56102732c8b38a72afb87385 Author: Benoit Jacob bjacob@mozilla.com Date: Mon Aug 11 22:57:16 2014 -0400

Bug 777574 - Skip all quickCheckAPI tests on linux/android/emulator slaves. r=kamidphish, a=test-only --- content/canvas/test/webgl/skipped_tests_android.txt | 11 +++++++++++ content/canvas/test/webgl/skipped_tests_linux.txt | 10 ++++++++++ content/canvas/test/webgl/skipped_tests_linux_mesa.txt | 11 +++++++++++ 3 files changed, 32 insertions(+)

diff --git a/content/canvas/test/webgl/skipped_tests_android.txt b/content/canvas/test/webgl/skipped_tests_android.txt index a5c15b8..6378f1f 100644 --- a/content/canvas/test/webgl/skipped_tests_android.txt +++ b/content/canvas/test/webgl/skipped_tests_android.txt @@ -34,3 +34,14 @@ conformance/textures/gl-teximage.html conformance/textures/tex-image-and-sub-image-2d-with-image.html conformance/textures/tex-image-with-format-and-type.html conformance/textures/texture-size.html +conformance/more/conformance/quickCheckAPI-A.html +conformance/more/conformance/quickCheckAPI-B1.html +conformance/more/conformance/quickCheckAPI-B2.html +conformance/more/conformance/quickCheckAPI-B3.html +conformance/more/conformance/quickCheckAPI-B4.html +conformance/more/conformance/quickCheckAPIBadArgs.html +conformance/more/conformance/quickCheckAPI-C.html +conformance/more/conformance/quickCheckAPI-D_G.html +conformance/more/conformance/quickCheckAPI-G_I.html +conformance/more/conformance/quickCheckAPI-L_S.html +conformance/more/conformance/quickCheckAPI-S_V.html diff --git a/content/canvas/test/webgl/skipped_tests_linux.txt b/content/canvas/test/webgl/skipped_tests_linux.txt index 443f3eb..44da05b 100644 --- a/content/canvas/test/webgl/skipped_tests_linux.txt +++ b/content/canvas/test/webgl/skipped_tests_linux.txt @@ -1 +1,11 @@ +conformance/more/conformance/quickCheckAPI-A.html +conformance/more/conformance/quickCheckAPI-B1.html conformance/more/conformance/quickCheckAPI-B2.html +conformance/more/conformance/quickCheckAPI-B3.html +conformance/more/conformance/quickCheckAPI-B4.html +conformance/more/conformance/quickCheckAPIBadArgs.html +conformance/more/conformance/quickCheckAPI-C.html +conformance/more/conformance/quickCheckAPI-D_G.html +conformance/more/conformance/quickCheckAPI-G_I.html +conformance/more/conformance/quickCheckAPI-L_S.html +conformance/more/conformance/quickCheckAPI-S_V.html diff --git a/content/canvas/test/webgl/skipped_tests_linux_mesa.txt b/content/canvas/test/webgl/skipped_tests_linux_mesa.txt index 194c317..fa67582 100644 --- a/content/canvas/test/webgl/skipped_tests_linux_mesa.txt +++ b/content/canvas/test/webgl/skipped_tests_linux_mesa.txt @@ -1,3 +1,14 @@ conformance/misc/type-conversion-test.html conformance/reading/read-pixels-test.html conformance/textures/texture-mips.html +conformance/more/conformance/quickCheckAPI-A.html +conformance/more/conformance/quickCheckAPI-B1.html +conformance/more/conformance/quickCheckAPI-B2.html +conformance/more/conformance/quickCheckAPI-B3.html +conformance/more/conformance/quickCheckAPI-B4.html +conformance/more/conformance/quickCheckAPIBadArgs.html +conformance/more/conformance/quickCheckAPI-C.html +conformance/more/conformance/quickCheckAPI-D_G.html +conformance/more/conformance/quickCheckAPI-G_I.html +conformance/more/conformance/quickCheckAPI-L_S.html +conformance/more/conformance/quickCheckAPI-S_V.html