diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2018-05-18 11:26:17 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2018-11-06 17:17:36 +0100 |
| commit | 24d8d40debcb00dcb3a2bf08c7dfe8d56c12198a (patch) | |
| tree | e390a55107fb3fe6aec81293e679f1dde009f0dd /cogl | |
| parent | 97004e6114991ae4e30be7ef871aec49c8738187 (diff) | |
| download | mutter-24d8d40debcb00dcb3a2bf08c7dfe8d56c12198a.tar.gz | |
cogl/tests: Mark failing test as known failure
This allows us to enable running the tests again. Not fixing the
failure is at least better than not running the tests at all.
Diffstat (limited to 'cogl')
| -rw-r--r-- | cogl/tests/conform/Makefile.am | 5 | ||||
| -rw-r--r-- | cogl/tests/conform/test-conform-main.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cogl/tests/conform/Makefile.am b/cogl/tests/conform/Makefile.am index f32fac226..2d284df53 100644 --- a/cogl/tests/conform/Makefile.am +++ b/cogl/tests/conform/Makefile.am @@ -134,9 +134,8 @@ test_conformance_LDADD = \ test_conformance_LDADD += $(top_builddir)/cogl-path/libmutter-cogl-path-$(LIBMUTTER_API_VERSION).la test_conformance_LDFLAGS = -export-dynamic -# XXX: uncomment when tests get fixed -#test: wrappers -# @$(top_srcdir)/tests/run-tests.sh $(abs_builddir)/../config.env $(abs_builddir)/test-conformance$(EXEEXT) +test: wrappers + @$(top_srcdir)/tests/run-tests.sh $(abs_builddir)/../config.env $(abs_builddir)/test-conformance$(EXEEXT) # XXX: we could prevent the conformance test suite from running # by simply defining this variable conditionally diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c index 526d41056..8084ea0cf 100644 --- a/cogl/tests/conform/test-conform-main.c +++ b/cogl/tests/conform/test-conform-main.c @@ -74,7 +74,8 @@ main (int argc, char **argv) ADD_TEST (test_pixel_buffer_set_data, 0, 0); ADD_TEST (test_pixel_buffer_sub_region, 0, 0); UNPORTED_TEST (test_texture_rectangle); - ADD_TEST (test_texture_3d, TEST_REQUIREMENT_TEXTURE_3D, 0); + ADD_TEST (test_texture_3d, TEST_REQUIREMENT_TEXTURE_3D, + TEST_REQUIREMENT_GL | TEST_KNOWN_FAILURE); ADD_TEST (test_wrap_modes, 0, 0); UNPORTED_TEST (test_texture_pixmap_x11); ADD_TEST (test_texture_get_set_data, 0, 0); |