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>
This commit is contained in:
Jonas Ådahl 2021-04-20 18:39:53 +02:00
parent ff0afb186a
commit f74d311d61
8 changed files with 11 additions and 11 deletions

View File

@ -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 (

View File

@ -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"

View File

@ -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>

View File

@ -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 */

View File

@ -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 *

View File

@ -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 = {

View File

@ -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)

View File

@ -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"