all: merge branch 'th/rename-tests'

Rename tests so that they have unique names.

meson requires that the build executables have unique names (at least,
older versions). Hence, we used to name the test binary different from
the source file ("libnm-test-general" vs. "test-general.c").

The tests should be named "*/tests/test-*", and the source file should
have the same name as the test executable.

Rename the sources so that the names are unique.

17 files changed, 142 insertions, 146 deletions

diff --git a/.gitignore b/.gitignore
index 5b752e7b1a..e30ef9eb95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,10 @@ test-*.trs
 /conftest.[ch]
 /conftest.o.*
 
+/contrib/fedora/rpm/NetworkManager.*.??????/
+/contrib/fedora/rpm/latest0
+/contrib/fedora/rpm/latest
+
 /dispatcher/nm-avahi-autoipd.action
 /dispatcher/nm-dispatcher
 /dispatcher/nmdbus-dispatcher.*
@@ -63,7 +67,7 @@ test-*.trs
 
 /clients/cli/nmcli
 /clients/common/settings-docs.h
-/clients/common/tests/test-general
+/clients/common/tests/test-clients-common
 /clients/common/tests/test-libnm-core-aux
 /clients/nm-online
 /clients/tui/newt/libnmt-newt.a
@@ -96,33 +100,6 @@ test-*.trs
 
 /docs/api/dbus-org.freedesktop.NetworkManager*.xml
 
-/docs/libnm-glib/*.stamp
-/docs/libnm-glib/html/
-/docs/libnm-glib/tmpl/
-/docs/libnm-glib/xml/
-/docs/libnm-glib/libnm-glib-*.txt
-/docs/libnm-glib/libnm-glib.args
-/docs/libnm-glib/libnm-glib.hierarchy
-/docs/libnm-glib/libnm-glib.interfaces
-/docs/libnm-glib/libnm-glib.prerequisites
-/docs/libnm-glib/libnm-glib.signals
-/docs/libnm-glib/version.xml
-
-/docs/libnm-util/*.stamp
-/docs/libnm-util/html/
-/docs/libnm-util/tmpl/
-/docs/libnm-util/xml/
-/docs/libnm-util/libnm-util-*.txt
-/docs/libnm-util/libnm-util-decl-list.txt.bak
-/docs/libnm-util/libnm-util-decl.txt.bak
-/docs/libnm-util/libnm-util.args
-/docs/libnm-util/libnm-util.hierarchy
-/docs/libnm-util/libnm-util.interfaces
-/docs/libnm-util/libnm-util.prerequisites
-/docs/libnm-util/libnm-util.signals
-/docs/libnm-util/libnm-util.types
-/docs/libnm-util/version.xml
-
 /docs/libnm/*.stamp
 /docs/libnm/html/
 /docs/libnm/tmpl/
@@ -147,14 +124,14 @@ test-*.trs
 /examples/C/qt/add-connection-wired
 /examples/C/qt/list-connections
 /examples/C/qt/change-ipv4-addresses
+/examples/C/qt/monitor-nm-running
+/examples/C/qt/monitor-nm-running.moc
 
 /shared/nm-utils/tests/test-shared-general
 /shared/nm-version-macros.h
 
 /introspection/org.freedesktop.NetworkManager*.[ch]
 
-/libgsystem/
-
 /libnm-core/tests/test-compare
 /libnm-core/tests/test-crypto
 /libnm-core/tests/test-settings-defaults
@@ -166,29 +143,12 @@ test-*.trs
 /libnm-core/nm-dbus-types.xml
 /libnm-core/nm-vpn-dbus-types.xml
 
-/libnm-glib/nm-secret-agent-glue.h
-/libnm-glib/nm-vpn-plugin-glue.h
-/libnm-glib/libnm-glib-test
-/libnm-glib/tests/test-nm-client
-/libnm-glib/tests/test-remote-settings-client
-
-/libnm-util/test-crypto
-/libnm-util/tests/test-crypto
-/libnm-util/tests/test-settings-defaults
-/libnm-util/tests/test-general
-/libnm-util/tests/test-libnm-linking
-/libnm-util/tests/test-need-secrets
-/libnm-util/tests/test-secrets
-/libnm-util/tests/test-setting-8021x
-/libnm-util/tests/test-setting-dcb
-
-/libnm/fake-typelib/typelibs.c
 /libnm/nm-settings-ifcfg-rh-docs.xml
 /libnm/nm-property-docs.xml
 /libnm/nm-settings-docs.xml
 /libnm/nm-settings-docs-overrides.xml
 /libnm/nm-settings-keyfile-docs.xml
-/libnm/tests/test-general
+/libnm/tests/test-libnm
 /libnm/tests/test-nm-client
 /libnm/tests/test-remote-settings-client
 /libnm/tests/test-secret-agent
@@ -249,7 +209,7 @@ test-*.trs
 /src/NetworkManager.ver
 /src/devices/tests/test-acd
 /src/devices/tests/test-lldp
-/src/devices/wifi/tests/test-general
+/src/devices/wifi/tests/test-devices-wifi
 /src/dhcp/nm-dhcp-helper
 /src/dhcp/tests/test-dhcp-dhclient
 /src/dhcp/tests/test-dhcp-options
@@ -261,17 +221,28 @@ test-*.trs
 /src/nm-iface-helper
 /src/ndisc/tests/test-ndisc-fake
 /src/ndisc/tests/test-ndisc-linux
+/src/platform/tests/monitor
+/src/platform/tests/test-address-fake
+/src/platform/tests/test-address-linux
+/src/platform/tests/test-cleanup-fake
+/src/platform/tests/test-cleanup-linux
+/src/platform/tests/test-link-fake
+/src/platform/tests/test-link-linux
+/src/platform/tests/test-nmp-object
+/src/platform/tests/test-platform-general
+/src/platform/tests/test-route-fake
+/src/platform/tests/test-route-linux
 /src/settings/plugins/ibft/tests/test-ibft
 /src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
 /src/settings/plugins/ifupdown/tests/test-ifupdown
-/src/settings/plugins/keyfile/tests/test-keyfile
+/src/settings/plugins/keyfile/tests/test-keyfile-settings
 /src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
 /src/supplicant/tests/test-supplicant-config
 /src/tests/config/test-config
 /src/tests/test-dcb
-/src/tests/test-general
-/src/tests/test-general-with-expect
+/src/tests/test-core
+/src/tests/test-core-with-expect
 /src/tests/test-ip4-config
 /src/tests/test-ip6-config
 /src/tests/test-route-manager-fake
@@ -291,32 +262,82 @@ test-*.trs
 /callouts/nmdbus-dispatcher.*
 /callouts/org.freedesktop.nm_dispatcher.service
 /callouts/tests/test-dispatcher-envp
+/clients/cli/settings-docs.c
+/clients/common/settings-docs.c
+/clients/common/tests/test-general
+/docs/libnm-glib/*.stamp
+/docs/libnm-glib/html/
+/docs/libnm-glib/libnm-glib-*.txt
+/docs/libnm-glib/libnm-glib.args
+/docs/libnm-glib/libnm-glib.hierarchy
+/docs/libnm-glib/libnm-glib.interfaces
+/docs/libnm-glib/libnm-glib.prerequisites
+/docs/libnm-glib/libnm-glib.signals
+/docs/libnm-glib/tmpl/
+/docs/libnm-glib/version.xml
+/docs/libnm-glib/xml/
+/docs/libnm-util/*.stamp
+/docs/libnm-util/html/
+/docs/libnm-util/libnm-util-*.txt
+/docs/libnm-util/libnm-util-decl-list.txt.bak
+/docs/libnm-util/libnm-util-decl.txt.bak
+/docs/libnm-util/libnm-util.args
+/docs/libnm-util/libnm-util.hierarchy
+/docs/libnm-util/libnm-util.interfaces
+/docs/libnm-util/libnm-util.prerequisites
+/docs/libnm-util/libnm-util.signals
+/docs/libnm-util/libnm-util.types
+/docs/libnm-util/tmpl/
+/docs/libnm-util/version.xml
+/docs/libnm-util/xml/
 /include/
+/initscript/*/[Nn]etwork[Mm]anager
+/initscript/Slackware/rc.networkmanager
+/introspection/nmdbus-*.c
+/introspection/nmdbus-*.h
+/introspection/nmdbus-*.xml
+/libgsystem/
+/libnm-core/tests/test-setting-8021x
+/libnm-core/tests/test-setting-bond
+/libnm-core/tests/test-setting-dcb
+/libnm-glib/libnm-glib-test
+/libnm-glib/nm-secret-agent-glue.h
+/libnm-glib/nm-vpn-plugin-glue.h
+/libnm-glib/tests/test-nm-client
+/libnm-glib/tests/test-remote-settings-client
+/libnm-util/test-crypto
+/libnm-util/tests/test-crypto
+/libnm-util/tests/test-general
+/libnm-util/tests/test-libnm-linking
+/libnm-util/tests/test-need-secrets
+/libnm-util/tests/test-secrets
+/libnm-util/tests/test-setting-8021x
+/libnm-util/tests/test-setting-dcb
+/libnm-util/tests/test-settings-defaults
+/libnm/fake-typelib/typelibs.c
+/libnm/nm-ifcfg-rh-docs.xml
+/libnm/nm-keyfile-docs.xml
+/libnm/nm-setting-docs-overrides.xml
+/libnm/nm-setting-docs.xml
+/libnm/tests/test-general
 /policy/org.freedesktop.NetworkManager.policy
 /policy/org.freedesktop.NetworkManager.policy.in
-/initscript/Slackware/rc.networkmanager
-/initscript/*/[Nn]etwork[Mm]anager
+/src/devices/tests/test-arping
+/src/devices/wifi/tests/test-general
 /src/devices/wifi/tests/test-wifi-ap-utils
 /src/dhcp-manager/nm-dhcp-helper
 /src/dhcp-manager/tests/test-dhcp-dhclient
 /src/dhcp-manager/tests/test-dhcp-options
 /src/dhcp-manager/tests/test-dhcp-utils
 /src/dnsmasq-manager/tests/test-dnsmasq-utils
+/src/platform/tests/dump
+/src/platform/tests/platform
+/src/platform/tests/test-general
 /src/rdisc/
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
-/src/supplicant-manager/tests/test-supplicant-config
-/introspection/nmdbus-*.c
-/introspection/nmdbus-*.h
-/introspection/nmdbus-*.xml
-/libnm/nm-ifcfg-rh-docs.xml
-/libnm/nm-keyfile-docs.xml
-/libnm/nm-setting-docs.xml
-/libnm/nm-setting-docs-overrides.xml
-/clients/cli/settings-docs.c
-/clients/common/settings-docs.c
-/libnm-core/tests/test-setting-8021x
-/libnm-core/tests/test-setting-bond
-/libnm-core/tests/test-setting-dcb
 /src/settings/plugins/ifnet
+/src/settings/plugins/keyfile/tests/test-keyfile
+/src/supplicant-manager/tests/test-supplicant-config
+/src/tests/test-general
+/src/tests/test-general-with-expect
 /src/tests/test-resolvconf-capture
-/src/devices/tests/test-arping
diff --git a/Makefile.am b/Makefile.am
index 5520cc5b6a..a8e67e720a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1441,10 +1441,7 @@ EXTRA_DIST += \
 
 ###############################################################################
 
-libnm_tests_programs = \
-	libnm/tests/test-general
-
-check_programs += $(libnm_tests_programs)
+check_programs += libnm/tests/test-libnm
 
 libnm_tests_programs_req_introspection = \
 	libnm/tests/test-nm-client \
@@ -1475,14 +1472,14 @@ libnm_tests_ldadd = \
 libnm_tests_ldflags = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags)
+libnm_tests_test_libnm_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags)
 
-libnm_tests_test_general_SOURCES = \
+libnm_tests_test_libnm_SOURCES = \
 	shared/nm-utils/nm-compat.c \
-	libnm/tests/test-general.c
+	libnm/tests/test-libnm.c
 
 libnm_tests_test_nm_client_SOURCES = \
 	shared/nm-test-utils-impl.c \
@@ -1499,7 +1496,7 @@ libnm_tests_test_secret_agent_SOURCES = \
 	shared/nm-test-libnm-utils.h \
 	libnm/tests/test-secret-agent.c
 
-libnm_tests_test_general_LDADD = \
+libnm_tests_test_libnm_LDADD = \
 	libnm/libnm-utils.la \
 	$(libnm_tests_ldadd)
 
@@ -1507,12 +1504,12 @@ libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd)
 
-libnm_tests_test_general_LDFLAGS = $(libnm_tests_ldflags)
+libnm_tests_test_libnm_LDFLAGS = $(libnm_tests_ldflags)
 libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags)
 libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags)
 libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags)
 
-$(libnm_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(libnm_tests_test_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -2622,19 +2619,19 @@ EXTRA_DIST += \
 # src/settings/plugins/keyfile/tests
 ###############################################################################
 
-check_programs += src/settings/plugins/keyfile/tests/test-keyfile
+check_programs += src/settings/plugins/keyfile/tests/test-keyfile-settings
 
-src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = $(src_cppflags_test)
+src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_cppflags_test)
 
-src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
+src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
+src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \
 	src/libNetworkManagerTest.la
 
-$(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
 	src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
@@ -3400,21 +3397,21 @@ check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la
 
 check_local += check-local-devices-wifi
 
-check_programs += src/devices/wifi/tests/test-general
+check_programs += src/devices/wifi/tests/test-devices-wifi
 
-src_devices_wifi_tests_test_general_SOURCES = \
-	src/devices/wifi/tests/test-general.c \
+src_devices_wifi_tests_test_devices_wifi_SOURCES = \
+	src/devices/wifi/tests/test-devices-wifi.c \
 	src/devices/wifi/nm-wifi-ap.c \
 	src/devices/wifi/nm-wifi-ap.h \
 	src/devices/wifi/nm-wifi-utils.c \
 	src/devices/wifi/nm-wifi-utils.h
 
-src_devices_wifi_tests_test_general_CPPFLAGS = $(src_cppflags_base_test)
+src_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_cppflags_base_test)
 
-src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la
-src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
+src_devices_wifi_tests_test_devices_wifi_LDADD = src/libNetworkManagerTest.la
+src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
 
-$(src_devices_wifi_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 endif
 
@@ -3750,8 +3747,8 @@ src_tests_ldadd = \
 	src/libNetworkManagerTest.la
 
 check_programs += \
-	src/tests/test-general \
-	src/tests/test-general-with-expect \
+	src/tests/test-core \
+	src/tests/test-core-with-expect \
 	src/tests/test-ip4-config \
 	src/tests/test-ip6-config \
 	src/tests/test-dcb \
@@ -3771,13 +3768,13 @@ src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_dcb_LDADD = $(src_tests_ldadd)
 
-src_tests_test_general_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_general_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_general_LDADD = $(src_tests_ldadd)
+src_tests_test_core_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_core_LDFLAGS = $(src_tests_ldflags)
+src_tests_test_core_LDADD = $(src_tests_ldadd)
 
-src_tests_test_general_with_expect_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_general_with_expect_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_general_with_expect_LDADD = $(src_tests_ldadd)
+src_tests_test_core_with_expect_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_core_with_expect_LDFLAGS = $(src_tests_ldflags)
+src_tests_test_core_with_expect_LDADD = $(src_tests_ldadd)
 
 src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags)
@@ -3790,8 +3787,8 @@ src_tests_test_utils_LDADD = $(src_tests_ldadd)
 $(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -4085,29 +4082,29 @@ $(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h)
 $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp
 
 if HAVE_INTROSPECTION
-check_programs += clients/common/tests/test-general
+check_programs += clients/common/tests/test-clients-common
 else
 if BUILD_NMCLI
-check_programs += clients/common/tests/test-general
+check_programs += clients/common/tests/test-clients-common
 endif
 endif
 
-clients_common_tests_test_general_CPPFLAGS = \
+clients_common_tests_test_clients_common_CPPFLAGS = \
 	-I$(srcdir)/clients/common/tests \
 	$(clients_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(NULL)
 
-clients_common_tests_test_general_LDFLAGS = \
+clients_common_tests_test_clients_common_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
-clients_common_tests_test_general_LDADD = \
+clients_common_tests_test_clients_common_LDADD = \
 	libnm/libnm.la \
 	clients/common/libnmc-base.la \
 	clients/common/libnmc.la \
 	$(GLIB_LIBS)
 
-$(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_common_tests_test_clients_common_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build
index 88996f3a3c..d00d2ad656 100644
--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@@ -1,7 +1,9 @@
 
+test_name = 'test-clients-common'
+
 exe = executable(
-  'clients-test-general',
-  'test-general.c',
+  test_name,
+  test_name + '.c',
   dependencies: [
     libnm_dep,
     libnmc_dep,
@@ -14,7 +16,7 @@ exe = executable(
 )
 
 test(
-  'clients/common/tests/test-general',
+  test_name,
   test_script,
   args: test_args + [exe.full_path()],
 )
diff --git a/clients/common/tests/test-general.c b/clients/common/tests/test-clients-common.c
index c39901bae8..c39901bae8 100644
--- a/clients/common/tests/test-general.c
+++ b/clients/common/tests/test-clients-common.c
diff --git a/contrib/fedora/rpm/.gitignore b/contrib/fedora/rpm/.gitignore
deleted file mode 100644
index 47f09d2afe..0000000000
--- a/contrib/fedora/rpm/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/NetworkManager.*.??????/
-/latest0
-/latest
diff --git a/examples/C/qt/.gitignore b/examples/C/qt/.gitignore
deleted file mode 100644
index 8c97223318..0000000000
--- a/examples/C/qt/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/monitor-nm-running
-/monitor-nm-running.moc
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index d76b9f5f4d..7cc19af322 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -1,5 +1,5 @@
 test_units = [
-  ['test-general',                [libnm_utils, libnm_core], 30],
+  ['test-libnm',                  [libnm_utils, libnm_core], 30],
   ['test-nm-client',              [],                        90],
   ['test-remote-settings-client', [],                        90],
   ['test-secret-agent',           [],                        90],
@@ -12,7 +12,7 @@ cflags = [
 
 foreach test_unit: test_units
   exe = executable(
-    'libnm-' + test_unit[0],
+    test_unit[0],
     [
       test_unit[0] + '.c',
       shared_nm_test_utils_impl_c,
@@ -27,7 +27,7 @@ foreach test_unit: test_units
   )
 
   test(
-    'libnm/' + test_unit[0],
+    test_unit[0],
     test_script,
     timeout: test_unit[2],
     args: test_args + [exe.full_path()],
diff --git a/libnm/tests/test-general.c b/libnm/tests/test-libnm.c
index 410087af64..410087af64 100644
--- a/libnm/tests/test-general.c
+++ b/libnm/tests/test-libnm.c
diff --git a/src/devices/wifi/tests/meson.build b/src/devices/wifi/tests/meson.build
index 895853c4c0..ba756d531b 100644
--- a/src/devices/wifi/tests/meson.build
+++ b/src/devices/wifi/tests/meson.build
@@ -1,13 +1,13 @@
-test_unit = 'test-general'
+test_unit = 'test-devices-wifi'
 
 exe = executable(
-  'wifi-' + test_unit,
+  test_unit,
   [test_unit + '.c'] + common_sources,
   dependencies: test_nm_dep,
 )
 
 test(
-  'devices/wifi/' + test_unit,
+  test_unit,
   test_script,
   args: test_args + [exe.full_path()],
   timeout: default_test_timeout,
diff --git a/src/devices/wifi/tests/test-general.c b/src/devices/wifi/tests/test-devices-wifi.c
index e08998379e..e08998379e 100644
--- a/src/devices/wifi/tests/test-general.c
+++ b/src/devices/wifi/tests/test-devices-wifi.c
diff --git a/src/ndisc/tests/.gitignore b/src/ndisc/tests/.gitignore
deleted file mode 100644
index 605f4b0125..0000000000
--- a/src/ndisc/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ndisc
diff --git a/src/platform/tests/.gitignore b/src/platform/tests/.gitignore
deleted file mode 100644
index 7ebc980c2f..0000000000
--- a/src/platform/tests/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/monitor
-/platform
-/test-address-fake
-/test-address-linux
-/test-cleanup-fake
-/test-cleanup-linux
-/test-link-fake
-/test-link-linux
-/test-nmp-object
-/test-platform-general
-/test-route-fake
-/test-route-linux
-
-# no longer exists but was used in the past.
-/dump
-/test-general
diff --git a/src/settings/plugins/keyfile/tests/meson.build b/src/settings/plugins/keyfile/tests/meson.build
index 752b6d7bd1..f1e96bdfe3 100644
--- a/src/settings/plugins/keyfile/tests/meson.build
+++ b/src/settings/plugins/keyfile/tests/meson.build
@@ -1,6 +1,4 @@
-test_unit = 'test-keyfile'
-
-test_keyfiles_dir = join_paths(meson.current_source_dir(), 'keyfiles')
+test_unit = 'test-keyfile-settings'
 
 exe = executable(
   test_unit,
@@ -9,7 +7,7 @@ exe = executable(
 )
 
 test(
-  'keyfile/' + test_unit,
+  test_unit,
   test_script,
   args: test_args + [exe.full_path()],
   timeout: default_test_timeout,
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
index baecac13bc..baecac13bc 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 17857676b3..b2bc13ab37 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -1,8 +1,8 @@
 subdir('config')
 
 test_units = [
-  'test-general',
-  'test-general-with-expect',
+  'test-core',
+  'test-core-with-expect',
   'test-ip4-config',
   'test-ip6-config',
   'test-dcb',
@@ -18,7 +18,7 @@ foreach test_unit: test_units
   )
 
   test(
-    'src/' + test_unit,
+    test_unit,
     test_script,
     args: test_args + [exe.full_path()],
     timeout: default_test_timeout,
@@ -34,7 +34,7 @@ cflags = [
 
 exe = executable(
   test_unit,
-  [test_unit + '.c'],
+  test_unit + '.c',
   include_directories: src_inc,
   dependencies: libnm_core_dep,
   c_args: cflags,
@@ -45,7 +45,7 @@ exe = executable(
 )
 
 test(
-  'src/' + test_unit,
+  test_unit,
   test_script,
   args: test_args + [exe.full_path()],
 )
diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-core-with-expect.c
index 8339fa5d43..8339fa5d43 100644
--- a/src/tests/test-general-with-expect.c
+++ b/src/tests/test-core-with-expect.c
diff --git a/src/tests/test-general.c b/src/tests/test-core.c
index cedf5b8a9a..cedf5b8a9a 100644
--- a/src/tests/test-general.c
+++ b/src/tests/test-core.c