From 6850e09718ee7c43f6818060fa39d10bb17b118d Mon Sep 17 00:00:00 2001 From: JerryShih Date: Tue, 24 May 2016 22:46:00 +0200 Subject: [PATCH] Bug 1178871 - turn on WebGL conformance test |conformance/glsl/misc/shader-struct-scope|. r=jgilbert --- dom/canvas/test/webgl-conf/generated-mochitest.ini | 1 - dom/canvas/test/webgl-conf/mochitest-errata.ini | 3 --- 2 files changed, 4 deletions(-) diff --git a/dom/canvas/test/webgl-conf/generated-mochitest.ini b/dom/canvas/test/webgl-conf/generated-mochitest.ini index dfa953cc1404..9df2a3ab7269 100644 --- a/dom/canvas/test/webgl-conf/generated-mochitest.ini +++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini @@ -2662,7 +2662,6 @@ fail-if = (os == 'win' && os_version == '5.1') fail-if = (os == 'android' && android_version == '10') [generated/test_conformance__glsl__misc__shader-precision-format-obeyed.html] [generated/test_conformance__glsl__misc__shader-struct-scope.html] -fail-if = (os == 'mac') [generated/test_conformance__glsl__misc__shader-uniform-packing-restrictions.html] skip-if = (os == 'android') [generated/test_conformance__glsl__misc__shader-varying-packing-restrictions.html] diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.ini b/dom/canvas/test/webgl-conf/mochitest-errata.ini index ab386076d44b..1c9074717ca5 100644 --- a/dom/canvas/test/webgl-conf/mochitest-errata.ini +++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini @@ -405,9 +405,6 @@ skip-if = (os == 'mac') # application crashed [@ gldAttachDrawable + 0x9e0]. Also crash on Android. skip-if = (os == 'mac') || (os == 'android') -[generated/test_conformance__glsl__misc__shader-struct-scope.html] -fail-if = (os == 'mac') - [generated/test_conformance__extensions__oes-vertex-array-object.html] # 10.6 crash: # PROCESS-CRASH | dom/canvas/test/webgl-conf/generated/test_conformance__extensions__oes-vertex-array-object.html | application crashed [@ gleRunVertexSubmitImmediate + 0xf24]