Moving tests/refcount/ directory to gobject/tests/

Modified by Philip Withnall to omit the subdirectory and drop the
`refcount` suite as both seem like unnecessary over-categorisation.

Related to issue #1434

10 files changed, 22 insertions, 61 deletions

diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index 8d568f00e..2b860f344 100644
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@ -57,6 +57,28 @@ gobject_tests = {
   'signalgroup' : {},
   'testing' : {},
   'type-flags' : {},
+  'objects-refcount1' : {},
+  'objects-refcount2' : {'suite' : ['slow']},
+  'properties-refcount1' : {},
+  'properties-refcount2' : {'suite' : ['slow']},
+  'properties-refcount3' : {'suite' : ['slow']},
+  'properties-refcount4' : {},
+  'signals-refcount1' : {
+    'source' : 'signals-refcount.c',
+    'c_args' : ['-DTESTNUM=1'],
+  },
+  'signals-refcount2' : {
+    'source' : 'signals-refcount.c',
+    'c_args' : ['-DTESTNUM=2'],
+  },
+  'signals-refcount3' : {
+    'source' : 'signals-refcount.c',
+    'c_args' : ['-DTESTNUM=3'],
+  },
+  'signals-refcount4' : {
+    'source' : 'signals-refcount.c',
+    'c_args' : ['-DTESTNUM=4'],
+  },
 }
 
 if cc.get_id() != 'msvc'
diff --git a/tests/refcount/objects.c b/gobject/tests/objects-refcount1.c
index 0d8e20b03..0d8e20b03 100644
--- a/tests/refcount/objects.c
+++ b/gobject/tests/objects-refcount1.c
diff --git a/tests/refcount/objects2.c b/gobject/tests/objects-refcount2.c
index 2e7c03836..2e7c03836 100644
--- a/tests/refcount/objects2.c
+++ b/gobject/tests/objects-refcount2.c
diff --git a/tests/refcount/properties.c b/gobject/tests/properties-refcount1.c
index 42176e923..42176e923 100644
--- a/tests/refcount/properties.c
+++ b/gobject/tests/properties-refcount1.c
diff --git a/tests/refcount/properties2.c b/gobject/tests/properties-refcount2.c
index 9536b5144..9536b5144 100644
--- a/tests/refcount/properties2.c
+++ b/gobject/tests/properties-refcount2.c
diff --git a/tests/refcount/properties3.c b/gobject/tests/properties-refcount3.c
index 8a96fb804..8a96fb804 100644
--- a/tests/refcount/properties3.c
+++ b/gobject/tests/properties-refcount3.c
diff --git a/tests/refcount/properties4.c b/gobject/tests/properties-refcount4.c
index 462f9e3cd..462f9e3cd 100644
--- a/tests/refcount/properties4.c
+++ b/gobject/tests/properties-refcount4.c
diff --git a/tests/refcount/signals.c b/gobject/tests/signals-refcount.c
index a9c11e32e..a9c11e32e 100644
--- a/tests/refcount/signals.c
+++ b/gobject/tests/signals-refcount.c
diff --git a/tests/meson.build b/tests/meson.build
index ea5b86013..7ebdc24a0 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -13,7 +13,6 @@ test_env.set('MALLOC_PERTURB_', '@0@'.format(random_number % 256))
 test_cargs = ['-DG_LOG_DOMAIN="GLib"', '-UG_DISABLE_ASSERT']
 
 subdir('gobject')
-subdir('refcount')
 
 test_extra_programs = {
   'assert-msg-test' : {},
diff --git a/tests/refcount/meson.build b/tests/refcount/meson.build
deleted file mode 100644
index 02571fe98..000000000
--- a/tests/refcount/meson.build
+++ /dev/null
@@ -1,60 +0,0 @@
-refcount_tests = {
-  'objects' : {},
-  'objects2' : {'suite' : ['slow']},
-  'properties' : {},
-  'properties2' : {'suite' : ['slow']},
-  'properties3' : {'suite' : ['slow']},
-  'properties4' : {},
-  'signal1' : {
-    'source' : 'signals.c',
-    'c_args' : ['-DTESTNUM=1'],
-  },
-  'signal2' : {
-    'source' : 'signals.c',
-    'c_args' : ['-DTESTNUM=2'],
-  },
-  'signal3' : {
-    'source' : 'signals.c',
-    'c_args' : ['-DTESTNUM=3'],
-  },
-  'signal4' : {
-    'source' : 'signals.c',
-    'c_args' : ['-DTESTNUM=4'],
-  },
-}
-
-common_c_args = test_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS']
-common_deps = [libm, thread_dep, libglib_dep, libgobject_dep]
-
-foreach test_name, extra_args : refcount_tests
-  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)
-
-  if install
-    test_conf = configuration_data()
-    test_conf.set('installed_tests_dir', installed_tests_execdir)
-    test_conf.set('program', test_name)
-    test_conf.set('env', '')
-    configure_file(
-      input: installed_tests_template,
-      output: test_name + '.test',
-      install_dir: installed_tests_metadir,
-      configuration: test_conf
-    )
-  endif
-
-  # FIXME? $(GLIB_DEBUG_FLAGS)
-  exe = executable(test_name, [source, extra_sources],
-    c_args : common_c_args + extra_args.get('c_args', []),
-    dependencies : common_deps + extra_args.get('dependencies', []),
-    install_dir: installed_tests_execdir,
-    install: install,
-  )
-
-  suite = ['refcount'] + extra_args.get('suite', [])
-  timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
-
-  # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
-  test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
-endforeach