From 9d21d115c62ca528293c0a412f965e6eccdaabb8 Mon Sep 17 00:00:00 2001
From: Moses Miller <Majora320@gmail.com>
Date: Sat, 25 Mar 2023 09:33:23 -0700
Subject: FindX11: Add more components to FindX11 tests

---
 Tests/FindX11/Test/CMakeLists.txt | 51 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

(limited to 'Tests')

diff --git a/Tests/FindX11/Test/CMakeLists.txt b/Tests/FindX11/Test/CMakeLists.txt
index e39ffb1eff..3312f6f772 100644
--- a/Tests/FindX11/Test/CMakeLists.txt
+++ b/Tests/FindX11/Test/CMakeLists.txt
@@ -32,16 +32,38 @@ test_x11_component(x11_components Xau)
 test_x11_component(x11_components Xaw)
 test_x11_component(x11_components xcb)
 test_x11_component(x11_components X11_xcb)
+test_x11_component(x11_components xcb_composite)
 test_x11_component(x11_components xcb_cursor)
+test_x11_component(x11_components xcb_damage)
+test_x11_component(x11_components xcb_dpms)
+test_x11_component(x11_components xcb_dri2)
+test_x11_component(x11_components xcb_dri3)
+test_x11_component(x11_components xcb_errors)
+test_x11_component(x11_components xcb_ewmh)
+test_x11_component(x11_components xcb_glx)
 test_x11_component(x11_components xcb_icccm)
+test_x11_component(x11_components xcb_image)
+test_x11_component(x11_components xcb_keysyms)
+test_x11_component(x11_components xcb_present)
 test_x11_component(x11_components xcb_randr)
+test_x11_component(x11_components xcb_record)
+test_x11_component(x11_components xcb_render)
+test_x11_component(x11_components xcb_render_util)
+test_x11_component(x11_components xcb_res)
+test_x11_component(x11_components xcb_screensaver)
 test_x11_component(x11_components xcb_shape)
+test_x11_component(x11_components xcb_shm)
+test_x11_component(x11_components xcb_sync)
 test_x11_component(x11_components xcb_util)
+test_x11_component(x11_components xcb_xf86dri)
 test_x11_component(x11_components xcb_xfixes)
+test_x11_component(x11_components xcb_xinerama)
+test_x11_component(x11_components xcb_xinput)
+test_x11_component(x11_components xcb_xkb)
 test_x11_component(x11_components xcb_xrm)
 test_x11_component(x11_components xcb_xtest)
-test_x11_component(x11_components xcb_keysyms)
-test_x11_component(x11_components xcb_xkb)
+test_x11_component(x11_components xcb_xvmc)
+test_x11_component(x11_components xcb_xv)
 test_x11_component(x11_components Xcomposite)
 test_x11_component(x11_components Xdamage)
 test_x11_component(x11_components Xdmcp)
@@ -79,13 +101,38 @@ foreach(lib
     Xaw
     xcb
     X11_xcb
+    xcb_composite
     xcb_cursor
+    xcb_damage
+    xcb_dpms
+    xcb_dri2
+    xcb_dri3
+    xcb_errors
+    xcb_ewmh
+    xcb_glx
     xcb_icccm
+    xcb_image
+    xcb_keysyms
+    xcb_present
     xcb_randr
+    xcb_record
+    xcb_render
+    xcb_render_util
+    xcb_res
+    xcb_screensaver
     xcb_shape
+    xcb_shm
+    xcb_sync
     xcb_util
+    xcb_xf86dri
     xcb_xfixes
+    xcb_xinerama
+    xcb_xinput
+    xcb_xkb
     xcb_xrm
+    xcb_xtest
+    xcb_xvmc
+    xcb_xv
     Xcomposite
     Xdamage
     Xdmcp
-- 
cgit v1.2.1


From 7a2b02e00036c428b7baeaf0579d716b1f63773b Mon Sep 17 00:00:00 2001
From: Moses Miller <Majora320@gmail.com>
Date: Tue, 28 Mar 2023 15:38:25 -0700
Subject: FindX11: Fix existing tests

---
 Tests/FindX11/Test/CMakeLists.txt | 10 ++++++++--
 Tests/FindX11/Test/main.c         | 42 +++++++++++++++++++++------------------
 2 files changed, 31 insertions(+), 21 deletions(-)

(limited to 'Tests')

diff --git a/Tests/FindX11/Test/CMakeLists.txt b/Tests/FindX11/Test/CMakeLists.txt
index 3312f6f772..afc10c9a5d 100644
--- a/Tests/FindX11/Test/CMakeLists.txt
+++ b/Tests/FindX11/Test/CMakeLists.txt
@@ -11,8 +11,14 @@ function (test_x11_component have_var component)
   endif ()
 
   add_executable(test_tgt_${component} main.c)
-  target_link_libraries(test_tgt_${component} PRIVATE X11::${component})
-  target_compile_definitions(test_tgt_${component} PRIVATE HAVE_X11_${component})
+
+  if (component MATCHES xcb)
+    target_link_libraries(test_tgt_${component} PRIVATE X11::${component} X11::xcb)
+    target_compile_definitions(test_tgt_${component} PRIVATE HAVE_X11_${component} HAVE_X11_xcb)
+  else()
+    target_link_libraries(test_tgt_${component} PRIVATE X11::${component})
+    target_compile_definitions(test_tgt_${component} PRIVATE HAVE_X11_${component})
+  endif()
   add_test(NAME test_tgt_${component} COMMAND test_tgt_${component})
 
   # Add to the list of components to test for the parent.
diff --git a/Tests/FindX11/Test/main.c b/Tests/FindX11/Test/main.c
index 5240de0f68..359470d861 100644
--- a/Tests/FindX11/Test/main.c
+++ b/Tests/FindX11/Test/main.c
@@ -326,7 +326,7 @@ static void test_Xaw(void)
 
 #endif
 
-#ifdef HAVE_xcb
+#ifdef HAVE_X11_xcb
 #  include <xcb/xcb.h>
 
 static void test_xcb(void)
@@ -336,23 +336,24 @@ static void test_xcb(void)
   xcb_disconnect(connection);
 }
 
-#  ifdef HAVE_xcb_cursor
+#  ifdef HAVE_X11_xcb_cursor
 #    include <xcb/xcb_cursor.h>
 
 static void test_xcb_cursor(void)
 {
   int screen_nbr;
   xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
-  xcb_screen_t* screen = xcb_aux_get_screen(conn, screen_nbr);
+  xcb_screen_iterator_t screens =
+    xcb_setup_roots_iterator(xcb_get_setup(connection));
   xcb_cursor_context_t* ctx;
-  xcb_cursor_context_new(connection, screen, &ctx);
+  xcb_cursor_context_new(connection, screens.data, &ctx);
   xcb_cursor_context_free(ctx);
   xcb_disconnect(connection);
 }
 
 #  endif
 
-#  ifdef HAVE_xcb_randr
+#  ifdef HAVE_X11_xcb_randr
 #    include <xcb/randr.h>
 
 static void test_xcb_randr(void)
@@ -366,7 +367,7 @@ static void test_xcb_randr(void)
 
 #  endif
 
-#  ifdef HAVE_xcb_shape
+#  ifdef HAVE_X11_xcb_shape
 #    include <xcb/shape.h>
 
 static void test_xcb_shape(void)
@@ -380,7 +381,9 @@ static void test_xcb_shape(void)
 
 #  endif
 
-#  ifdef HAVE_xcb_util
+#
+
+#  ifdef HAVE_X11_xcb_util
 #    include <xcb/xcb_aux.h>
 
 static void test_xcb_util(void)
@@ -393,8 +396,8 @@ static void test_xcb_util(void)
 
 #  endif
 
-#  ifdef HAVE_xcb_xfixes
-#    include <xcb/xcb_xfixes.h>
+#  ifdef HAVE_X11_xcb_xfixes
+#    include <xcb/xfixes.h>
 
 static void test_xcb_xfixes(void)
 {
@@ -406,7 +409,7 @@ static void test_xcb_xfixes(void)
 
 #  endif
 
-#  ifdef HAVE_xcb_xrm
+#  ifdef HAVE_X11_xcb_xrm
 #    include <xcb/xcb_xrm.h>
 
 static void test_xcb_xrm(void)
@@ -420,7 +423,7 @@ static void test_xcb_xrm(void)
 
 #  endif
 
-#  ifdef HAVE_xcb_xtest
+#  ifdef HAVE_X11_xcb_xtest
 #    include <xcb/xtest.h>
 
 static void test_xcb_xtest(void)
@@ -433,7 +436,7 @@ static void test_xcb_xtest(void)
 
 #  endif
 
-#  ifdef HAVE_xcb_keysyms
+#  ifdef HAVE_X11_xcb_keysyms
 #    include <xcb/xcb_keysyms.h>
 
 static void test_xcb_keysyms(void)
@@ -537,25 +540,25 @@ int main(int argc, char* argv[])
 #ifdef HAVE_X11_Xaw
     test_Xaw,
 #endif
-#ifdef HAVE_xcb
+#ifdef HAVE_X11_xcb
     test_xcb,
 #endif
-#ifdef HAVE_xcb_cursor
+#ifdef HAVE_X11_xcb_cursor
     test_xcb_cursor,
 #endif
-#ifdef HAVE_xcb_randr
+#ifdef HAVE_X11_xcb_randr
     test_xcb_randr,
 #endif
-#ifdef HAVE_xcb_shape
+#ifdef HAVE_X11_xcb_shape
     test_xcb_shape,
 #endif
-#ifdef HAVE_xcb_util
+#ifdef HAVE_X11_xcb_util
     test_xcb_util,
 #endif
-#ifdef HAVE_xcb_xfixes
+#ifdef HAVE_X11_xcb_xfixes
     test_xcb_xfixes,
 #endif
-#ifdef HAVE_xcb_xrm
+#ifdef HAVE_X11_xcb_xrm
     test_xcb_xrm,
 #endif
 
@@ -567,5 +570,6 @@ int main(int argc, char* argv[])
   // always 1 in the test harness which always returns the sentinel at the end
   // of the array. The array logic is there to ensure that the contents of
   // `fptrs` is not optimized out.
+#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
   return (int)fptrs[(sizeof(fptrs) / sizeof(*fptrs)) - argc];
 }
-- 
cgit v1.2.1


From 922a97f38a5da751092debf0d6754e7767bd0c7c Mon Sep 17 00:00:00 2001
From: Moses Miller <Majora320@gmail.com>
Date: Wed, 5 Apr 2023 15:03:20 -0700
Subject: FindX11: Add tests for newly added xcb libraries

---
 Tests/FindX11/Test/main.c | 429 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 421 insertions(+), 8 deletions(-)

(limited to 'Tests')

diff --git a/Tests/FindX11/Test/main.c b/Tests/FindX11/Test/main.c
index 359470d861..d227348a5c 100644
--- a/Tests/FindX11/Test/main.c
+++ b/Tests/FindX11/Test/main.c
@@ -336,6 +336,18 @@ static void test_xcb(void)
   xcb_disconnect(connection);
 }
 
+#  ifdef HAVE_X11_xcb_composite
+#    include <xcb/composite.h>
+
+static void test_xcb_composite(void)
+{
+  xcb_connection_t* connection = xcb_connect(NULL, NULL);
+  xcb_composite_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
 #  ifdef HAVE_X11_xcb_cursor
 #    include <xcb/xcb_cursor.h>
 
@@ -353,6 +365,169 @@ static void test_xcb_cursor(void)
 
 #  endif
 
+#  ifdef HAVE_X11_xcb_damage
+#    include <xcb/damage.h>
+
+static void test_xcb_damage(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_damage_query_version_cookie_t cookie =
+    xcb_damage_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_dpms
+#    include <xcb/dpms.h>
+
+static void test_xcb_dpms(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_dpms_get_version_cookie_t cookie =
+    xcb_dpms_get_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_dri2
+#    include <xcb/dri2.h>
+
+static void test_xcb_dri2(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_dri2_query_version_cookie_t cookie =
+    xcb_dri2_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_dri3
+#    include <xcb/dri3.h>
+
+static void test_xcb_dri3(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_dri3_query_version_cookie_t cookie =
+    xcb_dri3_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_errors
+#    include <xcb/xcb_errors.h>
+
+static void test_xcb_errors(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_errors_context_t* context;
+  xcb_errors_context_new(connection, &context);
+  xcb_errors_context_free(context);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_ewmh
+#    include <xcb/xcb_ewmh.h>
+
+static void test_xcb_ewmh(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_ewmh_connection_t ewmh_connection;
+  xcb_intern_atom_cookie_t* cookie =
+    xcb_ewmh_init_atoms(connection, &ewmh_connection);
+  xcb_ewmh_init_atoms_replies(&ewmh_connection, cookie, NULL);
+  xcb_ewmh_connection_wipe(&ewmh_connection);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_glx
+#    include <xcb/glx.h>
+
+static void test_xcb_glx(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_glx_query_version_cookie_t cookie =
+    xcb_glx_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_icccm
+#    include <xcb/xcb_icccm.h>
+
+static void test_xcb_icccm(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_window_t root =
+    xcb_setup_roots_iterator(xcb_get_setup(connection)).data->root;
+  xcb_get_property_cookie_t cookie = xcb_icccm_get_wm_name(connection, root);
+  xcb_icccm_get_text_property_reply_t reply;
+  xcb_icccm_get_wm_name_reply(connection, cookie, &reply, NULL);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_image
+#    include <xcb/xcb_image.h>
+
+static void test_xcb_image(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  // xcb_image is too convoluted/undocumented to make an
+  // actually working example, apologies :)
+  xcb_image_create(0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_keysyms
+#    include <xcb/xcb_keysyms.h>
+
+static void test_xcb_keysyms(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_key_symbols_t* symbols = xcb_key_symbols_alloc(connection);
+  if (symbols != NULL)
+    xcb_key_symbols_free(symbols);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_present
+#    include <xcb/present.h>
+
+static void test_xcb_present(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_present_query_version_cookie_t cookie =
+    xcb_present_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
 #  ifdef HAVE_X11_xcb_randr
 #    include <xcb/randr.h>
 
@@ -367,6 +542,76 @@ static void test_xcb_randr(void)
 
 #  endif
 
+#  ifdef HAVE_X11_xcb_record
+#    include <xcb/record.h>
+
+static void test_xcb_record(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_record_query_version_cookie_t cookie =
+    xcb_record_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_render
+#    include <xcb/render.h>
+
+static void test_xcb_render(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_render_query_version_cookie_t cookie =
+    xcb_render_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_render_util
+#    include <xcb/xcb_renderutil.h>
+
+static void test_xcb_render_util(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  const xcb_render_query_version_reply_t* cookie =
+    xcb_render_util_query_version(connection);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_res
+#    include <xcb/res.h>
+
+static void test_xcb_res(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_res_query_version_cookie_t cookie =
+    xcb_res_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_screensaver
+#    include <xcb/screensaver.h>
+
+static void test_xcb_screensaver(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_screensaver_query_version_cookie_t cookie =
+    xcb_screensaver_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
 #  ifdef HAVE_X11_xcb_shape
 #    include <xcb/shape.h>
 
@@ -381,7 +626,31 @@ static void test_xcb_shape(void)
 
 #  endif
 
-#
+#  ifdef HAVE_X11_xcb_shm
+#    include <xcb/shm.h>
+
+static void test_xcb_shm(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_shm_query_version_cookie_t cookie = xcb_shm_query_version(connection);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_sync
+#    include <xcb/sync.h>
+
+static void test_xcb_sync(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_sync_initialize_cookie_t cookie = xcb_sync_initialize(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
 
 #  ifdef HAVE_X11_xcb_util
 #    include <xcb/xcb_aux.h>
@@ -396,6 +665,20 @@ static void test_xcb_util(void)
 
 #  endif
 
+#  ifdef HAVE_X11_xcb_xf86dri
+#    include <xcb/xf86dri.h>
+
+static void test_xcb_xf86dri(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_xf86dri_query_version_cookie_t cookie =
+    xcb_xf86dri_query_version(connection);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
 #  ifdef HAVE_X11_xcb_xfixes
 #    include <xcb/xfixes.h>
 
@@ -409,6 +692,48 @@ static void test_xcb_xfixes(void)
 
 #  endif
 
+#  ifdef HAVE_X11_xcb_xinerama
+#    include <xcb/xinerama.h>
+
+static void test_xcb_xinerama(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_xinerama_query_version_cookie_t cookie =
+    xcb_xinerama_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_xinput
+#    include <xcb/xinput.h>
+
+static void test_xcb_xinput(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_input_xi_query_version_cookie_t cookie =
+    xcb_input_xi_query_version(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_xkb
+#    include <xcb/xkb.h>
+
+static void test_xcb_xkb(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_xkb_use_extension_cookie_t cookie =
+    xcb_xkb_use_extension(connection, 0, 0);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
 #  ifdef HAVE_X11_xcb_xrm
 #    include <xcb/xcb_xrm.h>
 
@@ -436,16 +761,27 @@ static void test_xcb_xtest(void)
 
 #  endif
 
-#  ifdef HAVE_X11_xcb_keysyms
-#    include <xcb/xcb_keysyms.h>
+#  ifdef HAVE_X11_xcb_xvmc
+#    include <xcb/xvmc.h>
 
-static void test_xcb_keysyms(void)
+static void test_xcb_xvmc(void)
 {
   int screen_nbr;
   xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
-  xcb_key_symbols_t* symbols = xcb_key_symbols_alloc(connection);
-  if (symbols != NULL)
-    xcb_key_symbols_free(symbols);
+  xcb_xvmc_query_version_cookie_t cookie = xcb_xvmc_query_version(connection);
+  xcb_disconnect(connection);
+}
+
+#  endif
+
+#  ifdef HAVE_X11_xcb_xv
+#    include <xcb/xv.h>
+
+static void test_xcb_xv(void)
+{
+  int screen_nbr;
+  xcb_connection_t* connection = xcb_connect(NULL, &screen_nbr);
+  xcb_xv_query_extension_cookie_t cookie = xcb_xv_query_extension(connection);
   xcb_disconnect(connection);
 }
 
@@ -543,25 +879,102 @@ int main(int argc, char* argv[])
 #ifdef HAVE_X11_xcb
     test_xcb,
 #endif
+#ifdef HAVE_X11_xcb_composite
+    test_xcb_composite,
+#endif
 #ifdef HAVE_X11_xcb_cursor
     test_xcb_cursor,
 #endif
+#ifdef HAVE_X11_xcb_damage
+    test_xcb_damage,
+#endif
+#ifdef HAVE_X11_xcb_dpms
+    test_xcb_dpms,
+#endif
+#ifdef HAVE_X11_xcb_dri2
+    test_xcb_dri2,
+#endif
+#ifdef HAVE_X11_xcb_dri3
+    test_xcb_dri3,
+#endif
+#ifdef HAVE_X11_xcb_errors
+    test_xcb_errors,
+#endif
+#ifdef HAVE_X11_xcb_ewmh
+    test_xcb_ewmh,
+#endif
+#ifdef HAVE_X11_xcb_glx
+    test_xcb_glx,
+#endif
+#ifdef HAVE_X11_xcb_icccm
+    test_xcb_icccm,
+#endif
+#ifdef HAVE_X11_xcb_image
+    test_xcb_image,
+#endif
+#ifdef HAVE_X11_xcb_keysyms
+    test_xcb_keysyms,
+#endif
+#ifdef HAVE_X11_xcb_present
+    test_xcb_present,
+#endif
 #ifdef HAVE_X11_xcb_randr
     test_xcb_randr,
 #endif
+#ifdef HAVE_X11_xcb_record
+    test_xcb_record,
+#endif
+#ifdef HAVE_X11_xcb_render
+    test_xcb_render,
+#endif
+#ifdef HAVE_X11_xcb_render_util
+    test_xcb_render_util,
+#endif
+#ifdef HAVE_X11_xcb_res
+    test_xcb_res,
+#endif
+#ifdef HAVE_X11_xcb_screensaver
+    test_xcb_screensaver,
+#endif
 #ifdef HAVE_X11_xcb_shape
     test_xcb_shape,
 #endif
+#ifdef HAVE_X11_xcb_shm
+    test_xcb_shm,
+#endif
+#ifdef HAVE_X11_xcb_sync
+    test_xcb_sync,
+#endif
 #ifdef HAVE_X11_xcb_util
     test_xcb_util,
 #endif
+#ifdef HAVE_X11_xcb_xf86dri
+    test_xcb_xf86dri,
+#endif
 #ifdef HAVE_X11_xcb_xfixes
     test_xcb_xfixes,
 #endif
+#ifdef HAVE_X11_xcb_xinerama
+    test_xcb_xinerama,
+#endif
+#ifdef HAVE_X11_xcb_xinput
+    test_xcb_xinput,
+#endif
+#ifdef HAVE_X11_xcb_xkb
+    test_xcb_xkb,
+#endif
 #ifdef HAVE_X11_xcb_xrm
     test_xcb_xrm,
 #endif
-
+#ifdef HAVE_X11_xcb_xtest
+    test_xcb_xtest,
+#endif
+#ifdef HAVE_X11_xcb_xvmc
+    test_xcb_xvmc,
+#endif
+#ifdef HAVE_X11_xcb_xv
+    test_xcb_xv,
+#endif
     NULL,
   };
 
-- 
cgit v1.2.1


From 65ade59835848720ec6f26daa5af32a5f780d4be Mon Sep 17 00:00:00 2001
From: Moses Miller <Majora320@gmail.com>
Date: Fri, 28 Apr 2023 14:54:35 -0700
Subject: FindX11: Remove HAS_X11_xcb check from xcb tests

---
 Tests/FindX11/Test/CMakeLists.txt |  10 +-
 Tests/FindX11/Test/main.c         | 226 ++++++++++++++++++++++----------------
 2 files changed, 131 insertions(+), 105 deletions(-)

(limited to 'Tests')

diff --git a/Tests/FindX11/Test/CMakeLists.txt b/Tests/FindX11/Test/CMakeLists.txt
index afc10c9a5d..3312f6f772 100644
--- a/Tests/FindX11/Test/CMakeLists.txt
+++ b/Tests/FindX11/Test/CMakeLists.txt
@@ -11,14 +11,8 @@ function (test_x11_component have_var component)
   endif ()
 
   add_executable(test_tgt_${component} main.c)
-
-  if (component MATCHES xcb)
-    target_link_libraries(test_tgt_${component} PRIVATE X11::${component} X11::xcb)
-    target_compile_definitions(test_tgt_${component} PRIVATE HAVE_X11_${component} HAVE_X11_xcb)
-  else()
-    target_link_libraries(test_tgt_${component} PRIVATE X11::${component})
-    target_compile_definitions(test_tgt_${component} PRIVATE HAVE_X11_${component})
-  endif()
+  target_link_libraries(test_tgt_${component} PRIVATE X11::${component})
+  target_compile_definitions(test_tgt_${component} PRIVATE HAVE_X11_${component})
   add_test(NAME test_tgt_${component} COMMAND test_tgt_${component})
 
   # Add to the list of components to test for the parent.
diff --git a/Tests/FindX11/Test/main.c b/Tests/FindX11/Test/main.c
index d227348a5c..2542145e5f 100644
--- a/Tests/FindX11/Test/main.c
+++ b/Tests/FindX11/Test/main.c
@@ -336,8 +336,11 @@ static void test_xcb(void)
   xcb_disconnect(connection);
 }
 
-#  ifdef HAVE_X11_xcb_composite
-#    include <xcb/composite.h>
+#endif
+
+#ifdef HAVE_X11_xcb_composite
+#  include <xcb/composite.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_composite(void)
 {
@@ -346,10 +349,11 @@ static void test_xcb_composite(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_cursor
-#    include <xcb/xcb_cursor.h>
+#ifdef HAVE_X11_xcb_cursor
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_cursor.h>
 
 static void test_xcb_cursor(void)
 {
@@ -363,10 +367,11 @@ static void test_xcb_cursor(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_damage
-#    include <xcb/damage.h>
+#ifdef HAVE_X11_xcb_damage
+#  include <xcb/damage.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_damage(void)
 {
@@ -377,10 +382,11 @@ static void test_xcb_damage(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_dpms
-#    include <xcb/dpms.h>
+#ifdef HAVE_X11_xcb_dpms
+#  include <xcb/dpms.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_dpms(void)
 {
@@ -391,10 +397,11 @@ static void test_xcb_dpms(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_dri2
-#    include <xcb/dri2.h>
+#ifdef HAVE_X11_xcb_dri2
+#  include <xcb/dri2.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_dri2(void)
 {
@@ -405,10 +412,11 @@ static void test_xcb_dri2(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_dri3
-#    include <xcb/dri3.h>
+#ifdef HAVE_X11_xcb_dri3
+#  include <xcb/dri3.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_dri3(void)
 {
@@ -419,10 +427,11 @@ static void test_xcb_dri3(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_errors
-#    include <xcb/xcb_errors.h>
+#ifdef HAVE_X11_xcb_errors
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_errors.h>
 
 static void test_xcb_errors(void)
 {
@@ -434,10 +443,11 @@ static void test_xcb_errors(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_ewmh
-#    include <xcb/xcb_ewmh.h>
+#ifdef HAVE_X11_xcb_ewmh
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_ewmh.h>
 
 static void test_xcb_ewmh(void)
 {
@@ -451,10 +461,11 @@ static void test_xcb_ewmh(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_glx
-#    include <xcb/glx.h>
+#ifdef HAVE_X11_xcb_glx
+#  include <xcb/glx.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_glx(void)
 {
@@ -465,10 +476,11 @@ static void test_xcb_glx(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_icccm
-#    include <xcb/xcb_icccm.h>
+#ifdef HAVE_X11_xcb_icccm
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_icccm.h>
 
 static void test_xcb_icccm(void)
 {
@@ -482,10 +494,11 @@ static void test_xcb_icccm(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_image
-#    include <xcb/xcb_image.h>
+#ifdef HAVE_X11_xcb_image
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_image.h>
 
 static void test_xcb_image(void)
 {
@@ -497,10 +510,11 @@ static void test_xcb_image(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_keysyms
-#    include <xcb/xcb_keysyms.h>
+#ifdef HAVE_X11_xcb_keysyms
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_keysyms.h>
 
 static void test_xcb_keysyms(void)
 {
@@ -512,10 +526,11 @@ static void test_xcb_keysyms(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_present
-#    include <xcb/present.h>
+#ifdef HAVE_X11_xcb_present
+#  include <xcb/present.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_present(void)
 {
@@ -526,10 +541,11 @@ static void test_xcb_present(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_randr
-#    include <xcb/randr.h>
+#ifdef HAVE_X11_xcb_randr
+#  include <xcb/randr.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_randr(void)
 {
@@ -540,10 +556,11 @@ static void test_xcb_randr(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_record
-#    include <xcb/record.h>
+#ifdef HAVE_X11_xcb_record
+#  include <xcb/record.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_record(void)
 {
@@ -554,10 +571,11 @@ static void test_xcb_record(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_render
-#    include <xcb/render.h>
+#ifdef HAVE_X11_xcb_render
+#  include <xcb/render.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_render(void)
 {
@@ -568,10 +586,11 @@ static void test_xcb_render(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_render_util
-#    include <xcb/xcb_renderutil.h>
+#ifdef HAVE_X11_xcb_render_util
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_renderutil.h>
 
 static void test_xcb_render_util(void)
 {
@@ -582,10 +601,11 @@ static void test_xcb_render_util(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_res
-#    include <xcb/res.h>
+#ifdef HAVE_X11_xcb_res
+#  include <xcb/res.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_res(void)
 {
@@ -596,10 +616,11 @@ static void test_xcb_res(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_screensaver
-#    include <xcb/screensaver.h>
+#ifdef HAVE_X11_xcb_screensaver
+#  include <xcb/screensaver.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_screensaver(void)
 {
@@ -610,10 +631,11 @@ static void test_xcb_screensaver(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_shape
-#    include <xcb/shape.h>
+#ifdef HAVE_X11_xcb_shape
+#  include <xcb/shape.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_shape(void)
 {
@@ -624,10 +646,11 @@ static void test_xcb_shape(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_shm
-#    include <xcb/shm.h>
+#ifdef HAVE_X11_xcb_shm
+#  include <xcb/shm.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_shm(void)
 {
@@ -637,10 +660,11 @@ static void test_xcb_shm(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_sync
-#    include <xcb/sync.h>
+#ifdef HAVE_X11_xcb_sync
+#  include <xcb/sync.h>
+#  include <xcb/xcb.h>
 
 static void test_xcb_sync(void)
 {
@@ -650,10 +674,11 @@ static void test_xcb_sync(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_util
-#    include <xcb/xcb_aux.h>
+#ifdef HAVE_X11_xcb_util
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_aux.h>
 
 static void test_xcb_util(void)
 {
@@ -663,10 +688,11 @@ static void test_xcb_util(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xf86dri
-#    include <xcb/xf86dri.h>
+#ifdef HAVE_X11_xcb_xf86dri
+#  include <xcb/xcb.h>
+#  include <xcb/xf86dri.h>
 
 static void test_xcb_xf86dri(void)
 {
@@ -677,10 +703,11 @@ static void test_xcb_xf86dri(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xfixes
-#    include <xcb/xfixes.h>
+#ifdef HAVE_X11_xcb_xfixes
+#  include <xcb/xcb.h>
+#  include <xcb/xfixes.h>
 
 static void test_xcb_xfixes(void)
 {
@@ -690,10 +717,11 @@ static void test_xcb_xfixes(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xinerama
-#    include <xcb/xinerama.h>
+#ifdef HAVE_X11_xcb_xinerama
+#  include <xcb/xcb.h>
+#  include <xcb/xinerama.h>
 
 static void test_xcb_xinerama(void)
 {
@@ -704,10 +732,11 @@ static void test_xcb_xinerama(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xinput
-#    include <xcb/xinput.h>
+#ifdef HAVE_X11_xcb_xinput
+#  include <xcb/xcb.h>
+#  include <xcb/xinput.h>
 
 static void test_xcb_xinput(void)
 {
@@ -718,10 +747,11 @@ static void test_xcb_xinput(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xkb
-#    include <xcb/xkb.h>
+#ifdef HAVE_X11_xcb_xkb
+#  include <xcb/xcb.h>
+#  include <xcb/xkb.h>
 
 static void test_xcb_xkb(void)
 {
@@ -732,10 +762,11 @@ static void test_xcb_xkb(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xrm
-#    include <xcb/xcb_xrm.h>
+#ifdef HAVE_X11_xcb_xrm
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_xrm.h>
 
 static void test_xcb_xrm(void)
 {
@@ -746,10 +777,11 @@ static void test_xcb_xrm(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xtest
-#    include <xcb/xtest.h>
+#ifdef HAVE_X11_xcb_xtest
+#  include <xcb/xcb.h>
+#  include <xcb/xtest.h>
 
 static void test_xcb_xtest(void)
 {
@@ -759,10 +791,11 @@ static void test_xcb_xtest(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xvmc
-#    include <xcb/xvmc.h>
+#ifdef HAVE_X11_xcb_xvmc
+#  include <xcb/xcb.h>
+#  include <xcb/xvmc.h>
 
 static void test_xcb_xvmc(void)
 {
@@ -772,10 +805,11 @@ static void test_xcb_xvmc(void)
   xcb_disconnect(connection);
 }
 
-#  endif
+#endif
 
-#  ifdef HAVE_X11_xcb_xv
-#    include <xcb/xv.h>
+#ifdef HAVE_X11_xcb_xv
+#  include <xcb/xcb.h>
+#  include <xcb/xv.h>
 
 static void test_xcb_xv(void)
 {
@@ -785,8 +819,6 @@ static void test_xcb_xv(void)
   xcb_disconnect(connection);
 }
 
-#  endif
-
 #endif
 
 #include <stddef.h>
-- 
cgit v1.2.1