Bug 759221 - 5/6 - mark known failing WebGL conformance tests on Android - r=jgilbert
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 08 Jun 2012 13:41:43 -0400
changeset 100998 c59fbb040bf366cd147f25341cff926a3928ea4a
parent 100997 63ed7906fa8bcc75add96ab3eb56062e86f7cfc7
child 100999 3b2f2ee46cc9998dfe348415aae172660388e533
push id1316
push userakeybl@mozilla.com
push dateMon, 27 Aug 2012 22:37:00 +0000
treeherdermozilla-beta@db4b09302ee2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs759221
milestone16.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 759221 - 5/6 - mark known failing WebGL conformance tests on Android - r=jgilbert
content/canvas/test/webgl/Makefile.in
content/canvas/test/webgl/failing_tests_android.txt
content/canvas/test/webgl/test_webgl_conformance_test_suite.html
--- a/content/canvas/test/webgl/Makefile.in
+++ b/content/canvas/test/webgl/Makefile.in
@@ -12,16 +12,17 @@ relativesrcdir  = content/canvas/test/we
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 _TEST_FILES = \
   test_webgl_conformance_test_suite.html \
   00_test_list.txt \
   failing_tests_linux.txt \
   failing_tests_windows.txt \
   failing_tests_mac.txt \
+  failing_tests_android.txt \
   $(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 	$(TAR) -cf - -C $(srcdir) \
 	  resources \
 	  conformance \
 	  | $(TAR) -xf - -C $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/content/canvas/test/webgl/failing_tests_android.txt
@@ -0,0 +1,35 @@
+conformance/extensions/oes-standard-derivatives.html
+conformance/glsl/functions/glsl-function-abs.html
+conformance/glsl/functions/glsl-function-ceil.html
+conformance/glsl/functions/glsl-function-clamp-float.html
+conformance/glsl/functions/glsl-function-clamp-gentype.html
+conformance/glsl/functions/glsl-function-cross.html
+conformance/glsl/functions/glsl-function-distance.html
+conformance/glsl/functions/glsl-function-dot.html
+conformance/glsl/functions/glsl-function-faceforward.html
+conformance/glsl/functions/glsl-function-floor.html
+conformance/glsl/functions/glsl-function-fract.html
+conformance/glsl/functions/glsl-function.html
+conformance/glsl/functions/glsl-function-length.html
+conformance/glsl/functions/glsl-function-max-float.html
+conformance/glsl/functions/glsl-function-max-gentype.html
+conformance/glsl/functions/glsl-function-min-float.html
+conformance/glsl/functions/glsl-function-min-gentype.html
+conformance/glsl/functions/glsl-function-mix-float.html
+conformance/glsl/functions/glsl-function-mix-gentype.html
+conformance/glsl/functions/glsl-function-mod-float.html
+conformance/glsl/functions/glsl-function-mod-gentype.html
+conformance/glsl/functions/glsl-function-normalize.html
+conformance/glsl/functions/glsl-function-reflect.html
+conformance/glsl/functions/glsl-function-sign.html
+conformance/glsl/functions/glsl-function-smoothstep-float.html
+conformance/glsl/functions/glsl-function-smoothstep-gentype.html
+conformance/glsl/functions/glsl-function-step-float.html
+conformance/glsl/functions/glsl-function-step-gentype.html
+conformance/glsl/misc/glsl-function-nodes.html
+conformance/glsl/misc/shared.html
+conformance/misc/null-object-behaviour.html
+conformance/renderbuffers/framebuffer-object-attachment.html
+conformance/textures/texture-mips.html
+conformance/textures/texture-npot.html
+conformance/textures/texture-npot-video.html
--- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@@ -44,19 +44,22 @@ var OPTIONS = {
 
 SimpleTest.waitForExplicitFinish();
 
 function start() {
 
   var kIsWindows = false;
   var kIsMac = false;
   var kIsLinux = false;
+  var kIsAndroid = false;
   if (navigator.platform.indexOf("Win") == 0)
     kIsWindows = true;
-  else if (navigator.platform.indexOf("Linux") == 0)
+  else if (navigator.appVersion.indexOf("Android") != -1)
+    kIsAndroid = true;
+  else if (navigator.platform.indexOf("Linux") == 0) // must be checked after android, as android also has a 'Linux' platform string
     kIsLinux = true;
   else if (navigator.platform.indexOf("Mac") == 0)
     kIsMac = true;
 
   var kIsWindowsVistaOrHigher = false;
   if (kIsWindows) {
     // code borrowed from browser/modules/test/browser_taskbar_preview.js
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
@@ -427,16 +430,18 @@ function start() {
   // presumably due to differences in the drivers.
   var failingTestsFilename;
   if (kIsWindows)
     failingTestsFilename = 'failing_tests_windows.txt';
   else if (kIsLinux)
     failingTestsFilename = 'failing_tests_linux.txt';
   else if (kIsMac)
     failingTestsFilename = 'failing_tests_mac.txt';
+  else if (kIsAndroid)
+    failingTestsFilename = 'failing_tests_android.txt';
 
   var testsExpectedToFail = loadTextFileSynchronous(failingTestsFilename)
                             .replace(/\r/g, '') // convert to unix line breaks
                             .split('\n');
 
   // remove empty filenames
   var indexOfEmptyFilename = testsExpectedToFail.indexOf("");
   while(indexOfEmptyFilename != -1) {