diff options
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | src/settings/plugins/keyfile/tests/meson.build | 6 | ||||
-rw-r--r-- | src/settings/plugins/keyfile/tests/test-keyfile-settings.c (renamed from src/settings/plugins/keyfile/tests/test-keyfile.c) | 0 |
4 files changed, 9 insertions, 10 deletions
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 index baecac13bc..baecac13bc 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile-settings.c |