diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-12-06 13:31:56 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-12-10 09:17:17 +0100 |
| commit | 44c5331e29d86808b9f8d9e210689183d89401bd (patch) | |
| tree | acef71a423be3448e0478f1a4db01d1f7abcad91 | |
| parent | a33ed5ad820242adcfa87d30f2a7dd540f1d32e8 (diff) | |
| download | NetworkManager-44c5331e29d86808b9f8d9e210689183d89401bd.tar.gz | |
shared: move "shared/nm-utils/tests/test-shared-general" to "shared/nm-glib-aux/tests"
"shared/nm-utils" got long renamed and split into separate parts. The remaining
tests are really to test nm-std-aux and nm-glib-aux (no libnm dependencies). Move
the tests to the appropriate place.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | shared/meson.build | 2 | ||||
| -rw-r--r-- | shared/nm-glib-aux/tests/meson.build (renamed from shared/nm-utils/tests/meson.build) | 2 | ||||
| -rw-r--r-- | shared/nm-glib-aux/tests/test-shared-general.c (renamed from shared/nm-utils/tests/test-shared-general.c) | 0 |
5 files changed, 9 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 7ef42f5c4b..8b8b7fad51 100644 --- a/.gitignore +++ b/.gitignore @@ -128,7 +128,7 @@ test-*.trs /examples/C/qt/monitor-nm-running /examples/C/qt/monitor-nm-running.moc -/shared/nm-utils/tests/test-shared-general +/shared/nm-glib-aux/tests/test-shared-general /shared/nm-version-macros.h /introspection/org.freedesktop.NetworkManager*.[ch] @@ -325,6 +325,7 @@ test-*.trs /libnm/tests/test-general /policy/org.freedesktop.NetworkManager.policy /policy/org.freedesktop.NetworkManager.policy.in +/shared/nm-utils/tests/test-shared-general /src/devices/tests/test-arping /src/devices/wifi/tests/test-general /src/devices/wifi/tests/test-wifi-ap-utils diff --git a/Makefile.am b/Makefile.am index ecacf568e6..451f36e553 100644 --- a/Makefile.am +++ b/Makefile.am @@ -526,14 +526,14 @@ $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_ ############################################################################### EXTRA_DIST += \ - shared/nm-utils/tests/meson.build \ + shared/nm-glib-aux/tests/meson.build \ $(NULL) ############################################################################### -check_programs += shared/nm-utils/tests/test-shared-general +check_programs += shared/nm-glib-aux/tests/test-shared-general -shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ +shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ -DNETWORKMANAGER_COMPILATION_TEST \ @@ -543,12 +543,12 @@ shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) -shared_nm_utils_tests_test_shared_general_LDFLAGS = \ +shared_nm_glib_aux_tests_test_shared_general_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) \ $(NULL) -shared_nm_utils_tests_test_shared_general_LDADD = \ +shared_nm_glib_aux_tests_test_shared_general_LDADD = \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/systemd/libnm-systemd-logging-stub.la \ shared/nm-std-aux/libnm-std-aux.la \ diff --git a/shared/meson.build b/shared/meson.build index 5f96d49dc6..88b2de8f09 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -256,5 +256,5 @@ libnm_systemd_logging_stub = static_library( ) if enable_tests - subdir('nm-utils/tests') + subdir('nm-glib-aux/tests') endif diff --git a/shared/nm-utils/tests/meson.build b/shared/nm-glib-aux/tests/meson.build index 1ee5efff95..37c5c1b44d 100644 --- a/shared/nm-utils/tests/meson.build +++ b/shared/nm-glib-aux/tests/meson.build @@ -14,7 +14,7 @@ exe = executable( ) test( - 'shared/nm-utils/' + test_unit, + 'shared/nm-glib-aux/' + test_unit, test_script, args: test_args + [exe.full_path()], timeout: default_test_timeout, diff --git a/shared/nm-utils/tests/test-shared-general.c b/shared/nm-glib-aux/tests/test-shared-general.c index 34da19b32f..34da19b32f 100644 --- a/shared/nm-utils/tests/test-shared-general.c +++ b/shared/nm-glib-aux/tests/test-shared-general.c |