[mutter] tests: Rename test-utils.c/h to meta-test-utils.c/h

[Marge Bot <marge-bot src gnome org>]

commit f74d311d61b5fc4df8bc0a398ef395be9dc2ca87
Author: Jonas Ådahl <jadahl gmail com>
Date:   Tue Apr 20 18:39:53 2021 +0200

    tests: Rename test-utils.c/h to meta-test-utils.c/h
    
    Otherwise it'll conflict with other files with identical filenames,
    if one would add src/tests/ to the include path, which will happen in a
    later commit.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>

 src/tests/meson.build                         | 4 ++--
 src/tests/meta-context-test.c                 | 2 +-
 src/tests/{test-utils.c => meta-test-utils.c} | 2 +-
 src/tests/{test-utils.h => meta-test-utils.h} | 6 +++---
 src/tests/monitor-test-utils.c                | 2 +-
 src/tests/monitor-unit-tests.c                | 2 +-
 src/tests/native-persistent-virtual-monitor.c | 2 +-
 src/tests/test-runner.c                       | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 26368c8685..6d7a8976b8 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -9,8 +9,8 @@ test_context_sources = [
   'meta-monitor-manager-test.h',
   'monitor-test-utils.c',
   'monitor-test-utils.h',
-  'test-utils.c',
-  'test-utils.h',
+  'meta-test-utils.c',
+  'meta-test-utils.h',
 ]
 
 clutter_test_utils = files (
diff --git a/src/tests/meta-context-test.c b/src/tests/meta-context-test.c
index 7ce7ac85b9..5e99322a91 100644
--- a/src/tests/meta-context-test.c
+++ b/src/tests/meta-context-test.c
@@ -26,7 +26,7 @@
 #include <gio/gio.h>
 
 #include "tests/meta-backend-test.h"
-#include "tests/test-utils.h"
+#include "tests/meta-test-utils.h"
 #include "wayland/meta-wayland.h"
 #include "wayland/meta-xwayland.h"
 
diff --git a/src/tests/test-utils.c b/src/tests/meta-test-utils.c
similarity index 99%
rename from src/tests/test-utils.c
rename to src/tests/meta-test-utils.c
index b0e7022c23..76276edc04 100644
--- a/src/tests/test-utils.c
+++ b/src/tests/meta-test-utils.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "tests/test-utils.h"
+#include "tests/meta-test-utils.h"
 
 #include <gio/gio.h>
 #include <string.h>
diff --git a/src/tests/test-utils.h b/src/tests/meta-test-utils.h
similarity index 97%
rename from src/tests/test-utils.h
rename to src/tests/meta-test-utils.h
index 06a8d085d8..0895cc8644 100644
--- a/src/tests/test-utils.h
+++ b/src/tests/meta-test-utils.h
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TEST_UTILS_H
-#define TEST_UTILS_H
+#ifndef META_TEST_UTILS_H
+#define META_TEST_UTILS_H
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -89,4 +89,4 @@ void test_wait_for_x11_display (void);
 void meta_ensure_test_client_path (int    argc,
                                    char **argv);
 
-#endif /* TEST_UTILS_H */
+#endif /* META_TEST_UTILS_H */
diff --git a/src/tests/monitor-test-utils.c b/src/tests/monitor-test-utils.c
index 705201810a..933b8912af 100644
--- a/src/tests/monitor-test-utils.c
+++ b/src/tests/monitor-test-utils.c
@@ -27,7 +27,7 @@
 #include "backends/meta-monitor-config-manager.h"
 #include "backends/meta-monitor-config-store.h"
 #include "backends/meta-output.h"
-#include "tests/test-utils.h"
+#include "tests/meta-test-utils.h"
 #include "meta-backend-test.h"
 
 MetaGpu *
diff --git a/src/tests/monitor-unit-tests.c b/src/tests/monitor-unit-tests.c
index f05bdb2773..6a6cc73bf1 100644
--- a/src/tests/monitor-unit-tests.c
+++ b/src/tests/monitor-unit-tests.c
@@ -32,7 +32,7 @@
 #include "meta-backend-test.h"
 #include "tests/meta-monitor-manager-test.h"
 #include "tests/monitor-test-utils.h"
-#include "tests/test-utils.h"
+#include "tests/meta-test-utils.h"
 #include "x11/meta-x11-display-private.h"
 
 static MonitorTestCase initial_test_case = {
diff --git a/src/tests/native-persistent-virtual-monitor.c b/src/tests/native-persistent-virtual-monitor.c
index d2f2d7d24e..d8d998cfe6 100644
--- a/src/tests/native-persistent-virtual-monitor.c
+++ b/src/tests/native-persistent-virtual-monitor.c
@@ -24,7 +24,7 @@
 #include "backends/meta-monitor-manager-private.h"
 #include "meta/meta-context.h"
 #include "meta/meta-backend.h"
-#include "tests/test-utils.h"
+#include "tests/meta-test-utils.h"
 
 static gboolean
 wait_for_paint (gpointer user_data)
diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
index 4112966d4b..f59594362c 100644
--- a/src/tests/test-runner.c
+++ b/src/tests/test-runner.c
@@ -28,7 +28,7 @@
 #include "meta/util.h"
 #include "meta/window.h"
 #include "tests/meta-context-test.h"
-#include "tests/test-utils.h"
+#include "tests/meta-test-utils.h"
 #include "ui/ui.h"
 #include "wayland/meta-wayland.h"
 #include "x11/meta-x11-display-private.h"