Merge branch 'tap-fix' into 'master'

Meson: Do not run tests/refcount with --tap

See merge request GNOME/glib!353
This commit is contained in:
Simon McVittie 2018-09-25 17:55:14 +00:00
commit 5040aee5bf

View File

@ -55,6 +55,5 @@ foreach test_name, extra_args : refcount_tests
suite = ['refcount'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args : ['--tap'])
test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach