diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2018-09-25 17:55:14 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2018-09-25 17:55:14 +0000 |
| commit | 5040aee5bfb746da86280b22234c121b82c5fd6a (patch) | |
| tree | dd57d6106d585d7f455f563c42476d62ee4fa5ce | |
| parent | b6171b97bf23645b14eb8a6a8c8b7a09500469da (diff) | |
| parent | 7c8e1f15cc500d2a24742435ae73a54856d7bfe6 (diff) | |
| download | glib-5040aee5bfb746da86280b22234c121b82c5fd6a.tar.gz | |
Merge branch 'tap-fix' into 'master'
Meson: Do not run tests/refcount with --tap
See merge request GNOME/glib!353
| -rw-r--r-- | tests/refcount/meson.build | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/refcount/meson.build b/tests/refcount/meson.build index fe341cac4..3a2072d08 100644 --- a/tests/refcount/meson.build +++ b/tests/refcount/meson.build @@ -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 |