Move tests/module-test.c to gmodules/tests/

Helps issue #1434

gmodule/tests/libmoduletestplugin_a.c

@@ -22,11 +22,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#undef G_DISABLE_ASSERT
-#undef G_LOG_DOMAIN
-
 #include	<gmodule.h>
-#include	<stdlib.h>
 
 G_MODULE_EXPORT void gplugin_a_func (void);
 G_MODULE_EXPORT void gplugin_clash_func (void);

gmodule/tests/libmoduletestplugin_b.c

@@ -22,9 +22,6 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#undef G_DISABLE_ASSERT
-#undef G_LOG_DOMAIN
-
 #include        <gmodule.h>
 
 G_MODULE_EXPORT gchar* gplugin_b_state;

gmodule/tests/meson.build

@@ -2,8 +2,40 @@ gmodule_tests = {
   'cxx' : {
     'source' : ['cxx.cpp'],
   },
+  'module-test-library' : {
+    'export_dynamic' : true,
+    'source': 'module-test.c',
+    'c_args': ['-DMODULE_TYPE="library"'],
+  },
+  'module-test-plugin' : {
+    'export_dynamic' : true,
+    'source': 'module-test.c',
+    'c_args': ['-DMODULE_TYPE="plugin"'],
+  },
 }
 
+module_suffix = []
+# Keep the autotools convention for shared module suffix because GModule
+# depends on it: https://gitlab.gnome.org/GNOME/glib/issues/520
+if ['darwin', 'ios'].contains(host_machine.system())
+  module_suffix = 'so'
+endif
+
+foreach module : ['moduletestplugin_a', 'moduletestplugin_b']
+  shared_module(module + '_plugin', 'lib@0@.c'.format(module),
+    dependencies : [libglib_dep, libgmodule_dep],
+    install_dir : installed_tests_execdir,
+    install : installed_tests_enabled,
+    name_suffix : module_suffix
+  )
+  shared_library(module + '_library', 'lib@0@.c'.format(module),
+    dependencies : [libglib_dep, libgmodule_dep],
+    install_dir : installed_tests_execdir,
+    install : installed_tests_enabled,
+    name_suffix : module_suffix
+  )
+endforeach
+
 test_env = environment()
 test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
 test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
@@ -35,6 +67,7 @@ foreach test_name, extra_args : gmodule_tests
     c_args : test_cargs + extra_args.get('c_args', []),
     link_args : extra_args.get('link_args', []),
     dependencies : test_deps + extra_args.get('dependencies', []),
+    export_dynamic : extra_args.get('export_dynamic', false),
     install_dir: installed_tests_execdir,
     install: install,
   )

gmodule/tests/module-test.c

@@ -30,7 +30,7 @@
 # define MODULE_FILENAME_PREFIX "lib"
 #endif
 
-gchar* global_state;
+gchar *global_state = NULL;
 
 G_MODULE_EXPORT void g_clash_func (void);
 

tests/meson.build

@@ -15,20 +15,7 @@ test_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT']
 subdir('gobject')
 subdir('refcount')
 
-tests = {
+tests = {}
-  'module-test-library' : {
-    'dependencies' : [libgmodule_dep],
-    'export_dynamic' : true,
-    'source': 'module-test.c',
-    'c_args': ['-DMODULE_TYPE="library"'],
-  },
-  'module-test-plugin' : {
-    'dependencies' : [libgmodule_dep],
-    'export_dynamic' : true,
-    'source': 'module-test.c',
-    'c_args': ['-DMODULE_TYPE="plugin"'],
-  },
-}
 
 test_extra_programs = {
   'slice-test' : {
@@ -37,28 +24,6 @@ test_extra_programs = {
   'assert-msg-test' : {},
 }
 
-module_suffix = []
-# Keep the autotools convention for shared module suffix because GModule
-# depends on it: https://gitlab.gnome.org/GNOME/glib/issues/520
-if ['darwin', 'ios'].contains(host_machine.system())
-  module_suffix = 'so'
-endif
-
-foreach module : ['moduletestplugin_a', 'moduletestplugin_b']
-  shared_module(module + '_plugin', 'lib@0@.c'.format(module),
-    dependencies : [libglib_dep, libgmodule_dep],
-    install_dir : installed_tests_execdir,
-    install : installed_tests_enabled,
-    name_suffix : module_suffix
-  )
-  shared_library(module + '_library', 'lib@0@.c'.format(module),
-    dependencies : [libglib_dep, libgmodule_dep],
-    install_dir : installed_tests_execdir,
-    install : installed_tests_enabled,
-    name_suffix : module_suffix
-  )
-endforeach
-
 common_c_args = test_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS']
 common_deps = [libm, thread_dep, libglib_dep]