[glib: 1/11] build: Move tests/refcount/closures to gobject/tests/closure-refcount

[Philip Withnall <pwithnall src gnome org>]

commit c96bfd57afcd4512339516e3919611477dc33382
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Feb 27 11:48:29 2019 +0000

    build: Move tests/refcount/closures to gobject/tests/closure-refcount
    
    One step towards removing the top-level tests/ directory.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>
    
    Helps: #1434

 tests/refcount/closures.c => gobject/tests/closure-refcount.c | 0
 gobject/tests/meson.build                                     | 8 ++++++++
 tests/refcount/meson.build                                    | 7 -------
 3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/tests/refcount/closures.c b/gobject/tests/closure-refcount.c
similarity index 100%
rename from tests/refcount/closures.c
rename to gobject/tests/closure-refcount.c
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index b7fb2364c..2de2002d3 100644
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@ -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
diff --git a/tests/refcount/meson.build b/tests/refcount/meson.build
index e17e38b45..02571fe98 100644
--- a/tests/refcount/meson.build
+++ b/tests/refcount/meson.build
@@ -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