shared: move "nm-test-utils.h" to "src/libnm-glib-aux/"th/move-to-src-shared

"nm-test-utils.h" is a header-only, helper library for our unit tests.
It was somewhat unmotivated in "shared/nm-utils", because all tests use
it, but it was not part of a "module".

Move it to "src/libnm-glib-aux/". It fits there very well. They both
have (only) a dependency on glib.

19 files changed, 18 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index dfd669ae97..88cdff5fb3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -436,6 +436,7 @@ src_libnm_glib_aux_libnm_glib_aux_la_SOURCES = \
 	src/libnm-glib-aux/nm-shared-utils.c \
 	src/libnm-glib-aux/nm-shared-utils.h \
 	src/libnm-glib-aux/nm-str-buf.h \
+	src/libnm-glib-aux/nm-test-utils.h \
 	src/libnm-glib-aux/nm-time-utils.c \
 	src/libnm-glib-aux/nm-time-utils.h \
 	src/libnm-glib-aux/nm-value-type.h \
@@ -5490,7 +5491,6 @@ EXTRA_DIST += \
 	shared/nm-test-utils-impl.c \
 	shared/nm-utils/nm-compat.c \
 	shared/nm-utils/nm-compat.h \
-	shared/nm-utils/nm-test-utils.h \
 	shared/nm-utils/nm-vpn-editor-plugin-call.h \
 	shared/nm-utils/nm-vpn-plugin-macros.h \
 	shared/nm-utils/nm-vpn-plugin-utils.c \
diff --git a/clients/cloud-setup/tests/test-cloud-setup-general.c b/clients/cloud-setup/tests/test-cloud-setup-general.c
index e7d898e0e4..88f2cb74ad 100644
--- a/clients/cloud-setup/tests/test-cloud-setup-general.c
+++ b/clients/cloud-setup/tests/test-cloud-setup-general.c
@@ -5,7 +5,7 @@
 #include "nm-cloud-setup-utils.h"
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/
 
diff --git a/clients/common/tests/test-clients-common.c b/clients/common/tests/test-clients-common.c
index 4336f0d533..9d24d1f021 100644
--- a/clients/common/tests/test-clients-common.c
+++ b/clients/common/tests/test-clients-common.c
@@ -9,7 +9,7 @@
 #include "nm-vpn-helpers.h"
 #include "nm-client-utils.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/
 
diff --git a/clients/common/tests/test-libnm-core-aux.c b/clients/common/tests/test-libnm-core-aux.c
index a0bfea25d2..a9bbe105bd 100644
--- a/clients/common/tests/test-libnm-core-aux.c
+++ b/clients/common/tests/test-libnm-core-aux.c
@@ -8,7 +8,7 @@
 #include "libnm-core-aux-extern/nm-libnm-core-aux.h"
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/
 
diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c
index 20097b56e6..21fa5cf758 100644
--- a/dispatcher/tests/test-dispatcher-envp.c
+++ b/dispatcher/tests/test-dispatcher-envp.c
@@ -11,7 +11,7 @@
 #include "nm-dispatcher-utils.h"
 #include "libnm-core-aux-extern/nm-dispatcher-api.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 #include "nmdbus-dispatcher.h"
 
diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c
index f97cd62c20..0f590a04c4 100644
--- a/libnm/tests/test-libnm.c
+++ b/libnm/tests/test-libnm.c
@@ -24,7 +24,7 @@
 #include "nm-vpn-service-plugin.h"
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/
 
diff --git a/shared/nm-test-libnm-utils.h b/shared/nm-test-libnm-utils.h
index cac54076c5..58909304d0 100644
--- a/shared/nm-test-libnm-utils.h
+++ b/shared/nm-test-libnm-utils.h
@@ -8,7 +8,7 @@
 
 #include "NetworkManager.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 typedef struct {
     GDBusConnection *bus;
diff --git a/src/core/nm-test-utils-core.h b/src/core/nm-test-utils-core.h
index f145904ef7..e92d380e24 100644
--- a/src/core/nm-test-utils-core.h
+++ b/src/core/nm-test-utils-core.h
@@ -11,7 +11,7 @@
 
 #define _NMTST_INSIDE_CORE 1
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-core-impl/tests/test-compare.c b/src/libnm-core-impl/tests/test-compare.c
index fb82c55910..3716399a9a 100644
--- a/src/libnm-core-impl/tests/test-compare.c
+++ b/src/libnm-core-impl/tests/test-compare.c
@@ -11,7 +11,7 @@
 
 #include "nm-property-compare.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 static void
 compare_ints(void)
diff --git a/src/libnm-core-impl/tests/test-crypto.c b/src/libnm-core-impl/tests/test-crypto.c
index 16082795cb..bdbcd0f3bd 100644
--- a/src/libnm-core-impl/tests/test-crypto.c
+++ b/src/libnm-core-impl/tests/test-crypto.c
@@ -15,7 +15,7 @@
 #include "nm-errors.h"
 #include "libnm-core-intern/nm-core-internal.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 #define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs"
 
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index dc794dfb08..c1465c9a12 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -64,7 +64,7 @@
 
 #include "test-general-enums.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /* When passing a "bool" typed argument to a variadic function that
  * expects a gboolean, the compiler will promote the integer type
diff --git a/src/libnm-core-impl/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c
index 3b1ee09155..2e5483e6aa 100644
--- a/src/libnm-core-impl/tests/test-keyfile.c
+++ b/src/libnm-core-impl/tests/test-keyfile.c
@@ -16,7 +16,7 @@
 #include "nm-setting-user.h"
 #include "nm-setting-proxy.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 #define TEST_CERT_DIR          NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs"
 #define TEST_WIRED_TLS_CA_CERT TEST_CERT_DIR "/test-ca-cert.pem"
diff --git a/src/libnm-core-impl/tests/test-secrets.c b/src/libnm-core-impl/tests/test-secrets.c
index e2a58ded3f..e371795c74 100644
--- a/src/libnm-core-impl/tests/test-secrets.c
+++ b/src/libnm-core-impl/tests/test-secrets.c
@@ -20,7 +20,7 @@
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 #define TEST_CERT_DIR                         NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs"
 #define TEST_NEED_SECRETS_EAP_TLS_CA_CERT     TEST_CERT_DIR "/test_ca_cert.pem"
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c
index 0b622ec877..ea68a02683 100644
--- a/src/libnm-core-impl/tests/test-setting.c
+++ b/src/libnm-core-impl/tests/test-setting.c
@@ -28,7 +28,7 @@
 #include "nm-errors.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 #define TEST_CERT_DIR NM_BUILD_SRCDIR "/src/libnm-core-impl/tests/certs"
 
diff --git a/src/libnm-core-impl/tests/test-settings-defaults.c b/src/libnm-core-impl/tests/test-settings-defaults.c
index e04a55ec7a..b9db71074a 100644
--- a/src/libnm-core-impl/tests/test-settings-defaults.c
+++ b/src/libnm-core-impl/tests/test-settings-defaults.c
@@ -20,7 +20,7 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 static void
 test_defaults(GType type, const char *name)
diff --git a/shared/nm-utils/nm-test-utils.h b/src/libnm-glib-aux/nm-test-utils.h
index cf884f9c41..cf884f9c41 100644
--- a/shared/nm-utils/nm-test-utils.h
+++ b/src/libnm-glib-aux/nm-test-utils.h
diff --git a/src/libnm-glib-aux/tests/test-json-aux.c b/src/libnm-glib-aux/tests/test-json-aux.c
index b27504482d..5f33f4fe39 100644
--- a/src/libnm-glib-aux/tests/test-json-aux.c
+++ b/src/libnm-glib-aux/tests/test-json-aux.c
@@ -6,7 +6,7 @@
 
 #include "libnm-glib-aux/nm-json-aux.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-glib-aux/tests/test-shared-general.c b/src/libnm-glib-aux/tests/test-shared-general.c
index bc3a85bf17..efb0937b54 100644
--- a/src/libnm-glib-aux/tests/test-shared-general.c
+++ b/src/libnm-glib-aux/tests/test-shared-general.c
@@ -11,7 +11,7 @@
 #include "libnm-glib-aux/nm-time-utils.h"
 #include "libnm-glib-aux/nm-ref-string.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-platform/tests/test-nm-platform.c b/src/libnm-platform/tests/test-nm-platform.c
index f4b32d4693..5b1b8e87a1 100644
--- a/src/libnm-platform/tests/test-nm-platform.c
+++ b/src/libnm-platform/tests/test-nm-platform.c
@@ -6,7 +6,7 @@
 #include "libnm-platform/nm-netlink.h"
 #include "libnm-platform/nmp-netns.h"
 
-#include "nm-utils/nm-test-utils.h"
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/