diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-05-19 14:02:29 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-19 14:41:00 +0200 |
| commit | fbe2fdd1678135cf70256518798365405fe6eb84 (patch) | |
| tree | 5ab2913b25fd8d6f46bf33a45a1675e643329b69 | |
| parent | 0c7bc1a5d926522b6818da9ceda038e9d9d36d19 (diff) | |
| download | NetworkManager-fbe2fdd1678135cf70256518798365405fe6eb84.tar.gz | |
libnm/tests: rename libnm's "test-general" to "test-libnm"
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | libnm/tests/meson.build | 6 | ||||
| -rw-r--r-- | libnm/tests/test-libnm.c (renamed from libnm/tests/test-general.c) | 0 |
4 files changed, 12 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index dca90af3d8..b7051afd5b 100644 --- a/.gitignore +++ b/.gitignore @@ -144,7 +144,7 @@ test-*.trs /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 @@ -303,6 +303,7 @@ test-*.trs /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 /src/devices/tests/test-arping diff --git a/Makefile.am b/Makefile.am index c4f0c51a66..455ea3127e 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) 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 |