From d27f6b9d0a02f709e78142fedc59eae24167b688 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 19 May 2019 11:12:53 +0200
Subject: [PATCH] keyfile/tests: rename core's "test-keyfile" to
 "test-keyfile-settings"

We already have "libnm-core/tests/test-keyfile.c" from which we build
"test-keyfile".

Our test binaries should be named the following:

- "*/tests/test-*"

- the test binary "*/tests/test-*" should be build from a source file
  "*/tests/test-*.c". Meaning: the source's and executable's name should
  correspond.

- test binaries should be named uniquely. Also, because older meson
  versions don't like having the same binary name more than once.

Rename to avoid the duplicate name.
---
 .gitignore                                             |  3 ++-
 Makefile.am                                            | 10 +++++-----
 src/settings/plugins/keyfile/tests/meson.build         |  6 ++----
 .../tests/{test-keyfile.c => test-keyfile-settings.c}  |  0
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename src/settings/plugins/keyfile/tests/{test-keyfile.c => test-keyfile-settings.c} (100%)

diff --git a/.gitignore b/.gitignore
index c86152bfab..bd9acce872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -221,7 +221,7 @@ test-*.trs
 /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
@@ -314,5 +314,6 @@ test-*.trs
 /src/rdisc/
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
 /src/settings/plugins/ifnet
+/src/settings/plugins/keyfile/tests/test-keyfile
 /src/supplicant-manager/tests/test-supplicant-config
 /src/tests/test-resolvconf-capture
diff --git a/Makefile.am b/Makefile.am
index 5520cc5b6a..80fb5a0ddf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2622,19 +2622,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 \
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
similarity index 100%
rename from src/settings/plugins/keyfile/tests/test-keyfile.c
rename to src/settings/plugins/keyfile/tests/test-keyfile-settings.c