platform/tests: rename platform's "test-general.c"

Older versions of meson don't like building multiple artifacts
with the same name (even if they are in different directories). We
have multiple tests called "test-general.c", and it would be natural
to compile a test binary of the same name.

  Meson encountered an error in file src/tests/meson.build, line 14, column 2:
  Tried to create target "test-general", but a target of that name already exists.

It's generally a bad idea to have in our source tree multiple files with the
same name. Rename the test.

Fixes: 16cd84d346f1 ('build/meson: rename platform tests to use same name as autotools'):

4 files changed, 57 insertions, 53 deletions

diff --git a/Makefile.am b/Makefile.am
index 30557d8ab5..5520cc5b6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3547,31 +3547,22 @@ check_programs_norun += \
 	src/platform/tests/monitor
 
 check_programs += \
-	src/platform/tests/test-link-fake \
-	src/platform/tests/test-link-linux \
 	src/platform/tests/test-address-fake \
 	src/platform/tests/test-address-linux \
-	src/platform/tests/test-general \
+	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/platform/tests/test-cleanup-fake \
-	src/platform/tests/test-cleanup-linux
+	$(NULL)
 
 src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
 src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd)
 
-src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
-src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c
-src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd)
-
 src_platform_tests_test_address_fake_SOURCES = src/platform/tests/test-address.c
 src_platform_tests_test_address_fake_CPPFLAGS = $(src_tests_cppflags_fake)
 src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags)
@@ -3582,16 +3573,6 @@ src_platform_tests_test_address_linux_CPPFLAGS = $(src_tests_cppflags_linux)
 src_platform_tests_test_address_linux_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_address_linux_LDADD = $(src_platform_tests_libadd)
 
-src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c
-src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake)
-src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd)
-
-src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c
-src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux)
-src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd)
-
 src_platform_tests_test_cleanup_fake_SOURCES = src/platform/tests/test-cleanup.c
 src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_tests_cppflags_fake)
 src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags)
@@ -3602,28 +3583,49 @@ src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux)
 src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd)
 
+src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
+src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake)
+src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd)
+
+src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c
+src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux)
+src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd)
+
 src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test)
 src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la
 
-src_platform_tests_test_general_CPPFLAGS = $(src_cppflags_test)
-src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags)
-src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la
-
-$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+src_platform_tests_test_platform_general_CPPFLAGS = $(src_cppflags_test)
+src_platform_tests_test_platform_general_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_platform_general_LDADD = src/libNetworkManagerTest.la
+
+src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c
+src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake)
+src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd)
+
+src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c
+src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux)
+src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags)
+src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd)
+
+$(src_platform_tests_monitor_OBJECTS):               $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_address_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_address_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_cleanup_fake_OBJECTS):     $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_cleanup_linux_OBJECTS):    $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_link_fake_OBJECTS):        $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_link_linux_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_nmp_object_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_route_fake_OBJECTS):       $(libnm_core_lib_h_pub_mkenums)
+$(src_platform_tests_test_route_linux_OBJECTS):      $(libnm_core_lib_h_pub_mkenums)
 
 EXTRA_DIST += \
-	src/platform/tests/meson.build
+	src/platform/tests/meson.build \
+	$(NULL)
 
 ###############################################################################
 # src/devices/tests
diff --git a/src/platform/tests/.gitignore b/src/platform/tests/.gitignore
index 536f012fbd..7ebc980c2f 100644
--- a/src/platform/tests/.gitignore
+++ b/src/platform/tests/.gitignore
@@ -1,14 +1,16 @@
-/dump
 /monitor
 /platform
 /test-address-fake
 /test-address-linux
 /test-cleanup-fake
 /test-cleanup-linux
-/test-general
 /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/platform/tests/meson.build b/src/platform/tests/meson.build
index b3a9616286..aaee8964eb 100644
--- a/src/platform/tests/meson.build
+++ b/src/platform/tests/meson.build
@@ -1,14 +1,14 @@
 test_units = [
-  ['test-link-fake',     'test-link.c',       test_nm_dep_fake,  default_test_timeout],
-  ['test-link-linux',    'test-link.c',       test_nm_dep_linux, 900],
-  ['test-address-fake',  'test-address.c',    test_nm_dep_fake,  default_test_timeout],
-  ['test-address-linux', 'test-address.c',    test_nm_dep_linux, default_test_timeout],
-  ['test-general',       'test-general.c',    test_nm_dep,       default_test_timeout],
-  ['test-nmp-object',    'test-nmp-object.c', test_nm_dep,       default_test_timeout],
-  ['test-route-fake',    'test-route.c',      test_nm_dep_fake,  default_test_timeout],
-  ['test-route-linux',   'test-route.c',      test_nm_dep_linux, default_test_timeout],
-  ['test-cleanup-fake',  'test-cleanup.c',    test_nm_dep_fake,  default_test_timeout],
-  ['test-cleanup-linux', 'test-cleanup.c',    test_nm_dep_linux, default_test_timeout],
+  [ 'test-address-fake',     'test-address.c',          test_nm_dep_fake,  default_test_timeout ],
+  [ 'test-address-linux',    'test-address.c',          test_nm_dep_linux, default_test_timeout ],
+  [ 'test-cleanup-fake',     'test-cleanup.c',          test_nm_dep_fake,  default_test_timeout ],
+  [ 'test-cleanup-linux',    'test-cleanup.c',          test_nm_dep_linux, default_test_timeout ],
+  [ 'test-link-fake',        'test-link.c',             test_nm_dep_fake,  default_test_timeout ],
+  [ 'test-link-linux',       'test-link.c',             test_nm_dep_linux, 900                  ],
+  [ 'test-nmp-object',       'test-nmp-object.c',       test_nm_dep,       default_test_timeout ],
+  [ 'test-platform-general', 'test-platform-general.c', test_nm_dep,       default_test_timeout ],
+  [ 'test-route-fake',       'test-route.c',            test_nm_dep_fake,  default_test_timeout ],
+  [ 'test-route-linux',      'test-route.c',            test_nm_dep_linux, default_test_timeout ],
 ]
 
 foreach test_unit: test_units
diff --git a/src/platform/tests/test-general.c b/src/platform/tests/test-platform-general.c
index eebc15d80d..eebc15d80d 100644
--- a/src/platform/tests/test-general.c
+++ b/src/platform/tests/test-platform-general.c