diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-06-20 15:03:27 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-06-20 15:03:27 -0700 |
| commit | 7021db66f57cbb6007ad9d62850d2d03bdf83df2 (patch) | |
| tree | 51e57defead132907e9cdb36ff8219bf507adc9e | |
| parent | 93a8c32dbab96f01d2b6a5fb5a4ad35c3529beb1 (diff) | |
enable browser.test_gles2_uniform_arrays
| -rw-r--r-- | tests/gles2_uniform_arrays.cpp | 5 | ||||
| -rw-r--r-- | tests/test_browser.py | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/gles2_uniform_arrays.cpp b/tests/gles2_uniform_arrays.cpp index 7293f9a9..d1823b0b 100644 --- a/tests/gles2_uniform_arrays.cpp +++ b/tests/gles2_uniform_arrays.cpp @@ -126,5 +126,10 @@ int main(int argc, char *argv[]) for(int i = 0; i < 4; ++i) RunTest(i); +#ifdef REPORT_RESULT + int result = 1; + REPORT_RESULT(); +#endif + return 0; } diff --git a/tests/test_browser.py b/tests/test_browser.py index c1b18da2..a50d55d9 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -1469,9 +1469,8 @@ keydown(100);keyup(100); // trigger the end def test_gl_vertex_buffer(self): self.btest('gl_vertex_buffer.c', reference='gl_vertex_buffer.png', args=['-s', 'GL_UNSAFE_OPTS=0', '-s', 'LEGACY_GL_EMULATION=1'], reference_slack=1) - # Does not pass due to https://bugzilla.mozilla.org/show_bug.cgi?id=924264 so disabled for now. - # def test_gles2_uniform_arrays(self): - # self.btest('gles2_uniform_arrays.cpp', args=['-s', 'GL_ASSERTIONS=1'], expected=['1']) + def test_gles2_uniform_arrays(self): + self.btest('gles2_uniform_arrays.cpp', args=['-s', 'GL_ASSERTIONS=1'], expected=['1']) def test_gles2_conformance(self): self.btest('gles2_conformance.cpp', args=['-s', 'GL_ASSERTIONS=1'], expected=['1']) |