tests/test-utils: Move test client path ensure helper to private header

It's only used from the test context, and the main test utils header
file will be used to export helper functionality, so move it out,
preparing for that.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>

4 files changed, 28 insertions, 5 deletions

diff --git a/src/tests/meta-context-test.c b/src/tests/meta-context-test.c
index 9eafab250..b9716e28c 100644
--- a/src/tests/meta-context-test.c
+++ b/src/tests/meta-context-test.c
@@ -27,7 +27,7 @@
 
 #include "core/meta-context-private.h"
 #include "tests/meta-backend-test.h"
-#include "tests/meta-test-utils.h"
+#include "tests/meta-test-utils-private.h"
 #include "wayland/meta-wayland.h"
 #include "wayland/meta-xwayland.h"
 
diff --git a/src/tests/meta-test-utils-private.h b/src/tests/meta-test-utils-private.h
new file mode 100644
index 000000000..2b36c58b4
--- /dev/null
+++ b/src/tests/meta-test-utils-private.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2017-2021 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef META_TEST_UTILS_PRIVATE_H
+#define META_TEST_UTILS_PRIVATE_H
+
+#include "tests/meta-test-utils.h"
+
+void meta_ensure_test_client_path (int    argc,
+                                   char **argv);
+
+#endif /* META_TEST_UTILS_PRIVATE_H */
diff --git a/src/tests/meta-test-utils.c b/src/tests/meta-test-utils.c
index 84d82a303..4bb469133 100644
--- a/src/tests/meta-test-utils.c
+++ b/src/tests/meta-test-utils.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "tests/meta-test-utils.h"
+#include "tests/meta-test-utils-private.h"
 
 #include <gio/gio.h>
 #include <string.h>
diff --git a/src/tests/meta-test-utils.h b/src/tests/meta-test-utils.h
index 833f86fe9..0b4c24755 100644
--- a/src/tests/meta-test-utils.h
+++ b/src/tests/meta-test-utils.h
@@ -82,7 +82,4 @@ void meta_test_client_destroy (MetaTestClient *client);
 
 const char * meta_test_get_plugin_name (void);
 
-void meta_ensure_test_client_path (int    argc,
-                                   char **argv);
-
 #endif /* TEST_UTILS_H */