diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-05-19 13:54:17 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-19 14:00:16 +0200 |
| commit | 0c7bc1a5d926522b6818da9ceda038e9d9d36d19 (patch) | |
| tree | ff4c365e6e9f499996c57fe88a9a510004127ec7 | |
| parent | c99bbc99b086286c2c19d7bff7ceb001d7206fa9 (diff) | |
| download | NetworkManager-0c7bc1a5d926522b6818da9ceda038e9d9d36d19.tar.gz | |
clients/tests: rename clients/common's "test-general" to "test-clients-common"
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | clients/common/tests/meson.build | 8 | ||||
| -rw-r--r-- | clients/common/tests/test-clients-common.c (renamed from clients/common/tests/test-general.c) | 0 |
4 files changed, 13 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index ac6690412a..dca90af3d8 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,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 @@ -249,6 +249,7 @@ test-*.trs /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 diff --git a/Makefile.am b/Makefile.am index 7926abd41e..c4f0c51a66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4085,29 +4085,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 |