luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 06:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Move tests/refcount/closures to gobject/tests/closure-refcount

Browse Source 
One step towards removing the top-level tests/ directory.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #1434
This commit is contained in:
Philip Withnall 2019-02-27 11:48:29 +00:00
parent 5c97cf666d
commit c96bfd57af
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/refcount/closures.c → gobject/tests/closure-refcount.c
View File

8
gobject/tests/meson.build
View File

@ -43,6 +43,7 @@ gobject_tests = {
'source' : 'private.c',
},
'closure' : {},
'closure-refcount' : { 'suite': ['slow'] },
'object' : {},
'signal-handler' : {},
'ifaceproperties' : {},
@ -95,6 +96,13 @@ foreach test_name, extra_args : gobject_tests
suite = ['gobject'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# FIXME: https://gitlab.gnome.org/GNOME/glib/issues/1316
# aka https://bugs.debian.org/880883
if test_name == 'closure-refcount' and ['arm', 'aarch64'].contains(host_cpu_family)
timeout = timeout * 10
endif
test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args: ['--tap'])
endforeach

7
tests/refcount/meson.build
View File

@ -1,5 +1,4 @@
refcount_tests = {
'closures' : {'suite' : ['slow']},
'objects' : {},
'objects2' : {'suite' : ['slow']},
'properties' : {},
@ -56,12 +55,6 @@ foreach test_name, extra_args : refcount_tests
suite = ['refcount'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# https://gitlab.gnome.org/GNOME/glib/issues/1316
# aka https://bugs.debian.org/880883
if test_name == 'closures' and ['arm', 'aarch64'].contains(host_cpu_family)
timeout = timeout * 10
endif
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach