Merge branch '1541-timeloop-closure' into 'master'

Meson: Install timeloop-closure test

Closes #1541

See merge request GNOME/glib!349

tests/gobject/meson.build

@@ -26,7 +26,9 @@ testmarshal_c = custom_target('testmarshal_c',
   ],
 )
 
-gobject_tests = {
+# FIXME: We are using list of dictionnaries until we can depend on Meson 0.48.0
+# that supports '+=' operator on dictionnaries.
+gobject_tests = [{
   'gvalue-test' : {'tap' : true},
   'paramspec-test' : {'tap' : true},
   'deftype' : {},
@@ -44,12 +46,19 @@ gobject_tests = {
   'accumulator' : {
     'extra_sources' : [testmarshal_c, testmarshal_h],
   },
-}
+}]
+
+if host_system != 'windows'
+  gobject_tests += [{
+    'timeloop-closure' : {},
+  }]
+endif
 
 common_c_args = test_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS']
 common_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
 
-foreach test_name, extra_args : gobject_tests
+foreach test_dict : gobject_tests
+  foreach test_name, extra_args : test_dict
     source = extra_args.get('source', test_name + '.c')
     extra_sources = extra_args.get('extra_sources', [])
     install = installed_tests_enabled and extra_args.get('install', true)
@@ -80,6 +89,7 @@ foreach test_name, extra_args : gobject_tests
     # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
     test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
   endforeach
+endforeach
 
 # Don't install these ones, and keep them out of 'make check' because they take too long...
 executable('performance', 'performance.c',
@@ -91,10 +101,3 @@ executable('performance-threaded', 'performance-threaded.c',
     c_args : common_c_args,
     dependencies : common_deps,
     install : false)
-
-if host_system != 'windows' and host_system != 'minix'
-  executable('timeloop-closure', 'timeloop-closure.c',
-      c_args : common_c_args,
-      dependencies : common_deps,
-      install : false)
-endif