[glib: 6/6] Merge branch 'wip/smcv/deprecated-prop-followup' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 4bc284fca6b2d06b866c9f9dd3321ea6bf574256
Merge: 9daa0b60c0 831f5c5c2d
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Oct 15 21:31:29 2022 +0000

    Merge branch 'wip/smcv/deprecated-prop-followup' into 'main'
    
    Run tests with G_ENABLE_DIAGNOSTIC=1
    
    See merge request GNOME/glib!2889

 gio/tests/defaultvalue.c              |  3 +++
 gio/tests/meson.build                 |  2 +-
 glib/tests/meson.build                |  4 +---
 gmodule/tests/meson.build             |  4 +---
 gobject/tests/meson.build             |  5 +----
 gobject/tests/performance/meson.build |  5 +----
 gobject/tests/reference.c             | 16 ++++++++++++++++
 gobject/tests/type.c                  |  2 +-
 meson.build                           |  5 +++++
 9 files changed, 30 insertions(+), 16 deletions(-)
---
diff --cc glib/tests/meson.build
index db01b54b48,eafb5743f9..8b5c58b8c5
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@@ -242,27 -230,15 +242,25 @@@ if installed_tests_enable
      'NormalizationTest.txt',
      'pages.ini',
      install_dir : installed_tests_execdir,
 +    install_tag : 'tests',
 +  )
 +  install_subdir('bookmarks',
 +    install_dir : installed_tests_execdir,
 +    install_tag : 'tests',
 +  )
 +  install_subdir('markups',
 +    install_dir : installed_tests_execdir,
 +    install_tag : 'tests',
 +  )
 +  install_subdir('time-zones',
 +    install_dir : installed_tests_execdir,
 +    install_tag : 'tests',
    )
 -  install_subdir('bookmarks', install_dir : installed_tests_execdir)
 -  install_subdir('markups', install_dir : installed_tests_execdir)
 -  install_subdir('time-zones', install_dir : installed_tests_execdir)
  endif
  
- test_env = environment()
+ test_env = environment(common_test_env)
  test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
  test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
- test_env.set('G_DEBUG', 'gc-friendly')
- test_env.set('MALLOC_CHECK_', '2')
  
  test_deps = [libm, thread_dep, libglib_dep]
  test_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT']
diff --cc gmodule/tests/meson.build
index 3968c43267,3de10ef746..a751f3185b
--- a/gmodule/tests/meson.build
+++ b/gmodule/tests/meson.build
@@@ -37,30 -26,24 +37,28 @@@ if ['darwin', 'ios'].contains(host_mach
    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
 +if get_option('default_library') != 'static'
 +  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_tag : 'tests',
 +      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_tag : 'tests',
 +      install : installed_tests_enabled,
 +      name_suffix : module_suffix
 +    )
 +  endforeach
 +endif
  
- test_env = environment()
+ test_env = environment(common_test_env)
  test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
  test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
- test_env.set('G_DEBUG', 'gc-friendly')
- test_env.set('MALLOC_CHECK_', '2')
  
  test_deps = [libm, thread_dep, libglib_dep, libgmodule_dep]
  test_cargs = ['-DG_LOG_DOMAIN="GModule"', '-UG_DISABLE_ASSERT']