[cogl: 2/2] Merge branch 'wip/smcv/tests-skip' into 'cogl-1.22'

[Emmanuele Bassi <ebassi src gnome org>]

commit b08e3cbc8c8aea1a52a998cdbbc84e53d32e310c
Merge: 24da6903 2e7271aa
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Tue Mar 10 16:03:11 2020 +0000

    Merge branch 'wip/smcv/tests-skip' into 'cogl-1.22'
    
    [1.22] Normally skip tests that are not expected to succeed
    
    See merge request GNOME/cogl!15

 test-fixtures/test-utils.c        |  4 +++-
 test-fixtures/test-utils.h        |  2 +-
 tests/conform/test-conform-main.c | 15 +++++++++++----
 tests/unit/test-unit-main.c       | 18 ++++++++++++------
 4 files changed, 27 insertions(+), 12 deletions(-)
---