diff --git a/src/tests/meson.build b/src/tests/meson.build index 26368c868..6d7a8976b 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 7ce7ac85b..5e99322a9 100644 --- a/src/tests/meta-context-test.c +++ b/src/tests/meta-context-test.c @@ -26,7 +26,7 @@ #include #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 b0e7022c2..76276edc0 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 #include 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 06a8d085d..0895cc864 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 . */ -#ifndef TEST_UTILS_H -#define TEST_UTILS_H +#ifndef META_TEST_UTILS_H +#define META_TEST_UTILS_H #include #include @@ -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 705201810..933b8912a 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 f05bdb277..6a6cc73bf 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 d2f2d7d24..d8d998cfe 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 4112966d4..f59594362 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"