diff -r 000000000000 -r 6474c204b198 content/canvas/test/webgl-conformance/mochitest.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/canvas/test/webgl-conformance/mochitest.ini	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,21 @@
+[DEFAULT]
+skip-if = e10s
+support-files =
+  00_test_list.txt
+  failing_tests_android.txt
+  failing_tests_android_nvidia.txt
+  failing_tests_android_x86.txt
+  failing_tests_linux.txt
+  failing_tests_linux_mesa.txt
+  failing_tests_linux_nvidia.txt
+  failing_tests_mac.txt
+  failing_tests_mac_mtnlion.txt
+  failing_tests_windows.txt
+  skipped_tests_android.txt
+  skipped_tests_android_x86.txt
+  skipped_tests_linux_mesa.txt
+  skipped_tests_win_vista.txt
+  skipped_tests_winxp.txt
+
+[test_webgl_conformance_test_suite.html]
+skip-if = (toolkit == 'android') || (buildapp == 'b2g') #android(bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests)