From c0746a04f970ca331896a289e1abb3cf63c1c399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 4 Aug 2022 20:36:09 +0200
Subject: [PATCH] tests/cogl: Migrate no-gl header test

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2555>
---
 cogl/tests/conform/meson.build                           | 1 -
 src/tests/cogl/conform/meson.build                       | 1 +
 .../tests => src/tests/cogl}/conform/test-no-gl-header.c | 9 ++++-----
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename {cogl/tests => src/tests/cogl}/conform/test-no-gl-header.c (77%)

diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build
index 63367ffe5..22d228208 100644
--- a/cogl/tests/conform/meson.build
+++ b/cogl/tests/conform/meson.build
@@ -1,6 +1,5 @@
 cogl_test_conformance_sources = [
   'test-conform-main.c',
-  'test-no-gl-header.c',
   'test-version.c',
   'test-layer-remove.c',
   'test-alpha-test.c',
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index 10a1e74bb..ea59c7551 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -24,6 +24,7 @@ cogl_tests = [
   [ 'test-point-size-attribute', [] ],
   [ 'test-point-sprite', [] ],
   [ 'test-point-sprite-known-failure', ['gl', 'gl3', 'gles2'] ],
+  [ 'test-no-gl-header', [] ],
 ]
 
 cogl_test_conformance_includes = [
diff --git a/cogl/tests/conform/test-no-gl-header.c b/src/tests/cogl/conform/test-no-gl-header.c
similarity index 77%
rename from cogl/tests/conform/test-no-gl-header.c
rename to src/tests/cogl/conform/test-no-gl-header.c
index 9618d840e..4fcacfc49 100644
--- a/cogl/tests/conform/test-no-gl-header.c
+++ b/src/tests/cogl/conform/test-no-gl-header.c
@@ -7,10 +7,9 @@
 #error "Including cogl.h shouldn't be including any GL headers"
 #endif
 
-void test_no_gl_header (void);
-
-void
-test_no_gl_header (void)
+int
+main (int    argc,
+      char **argv)
 {
+  return EXIT_SUCCESS;
 }
-