git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From b2c74f6a3dbe0aee2413800837314136947a4985 Mon Sep 17 00:00:00 2001
   2 From: Jan Beich <jbeich@FreeBSD.org>
   3 Date: Sat, 15 Feb 2020 02:03:45 +0000
   4 Subject: [PATCH] meson/tests: add missing dependencies on protocol headers
   5
   6 In file included from ../tests/connection-test.c:43:
   7 In file included from ../tests/test-compositor.h:30:
   8 ../src/wayland-client.h:40:10: fatal error: 'wayland-client-protocol.h' file not found
   9  #include "wayland-client-protocol.h"
  10           ^~~~~~~~~~~~~~~~~~~~~~~~~~~
  11 In file included from ../tests/display-test.c:45:
  12 In file included from ../src/wayland-server.h:104:
  13 src/wayland-server-protocol.h:4454:2: error: unterminated /* comment
  14         /**
  15         ^
  16 In file included from ../tests/cpp-compile-test.cpp:2:
  17 In file included from src/wayland-server-protocol.h:8:
  18 In file included from ../src/wayland-server.h:104:
  19 src/wayland-server-protocol.h:3:2: error: unterminated conditional directive
  20  #ifndef WAYLAND_SERVER_PROTOCOL_H
  21   ^
  22 ../tests/headers-protocol-test.c:33:2: error: including wayland-server-protocol.h did not include wayland-server.h!
  23  #error including wayland-server-protocol.h did not include wayland-server.h!
  24   ^
  25 In file included from ../tests/headers-protocol-test.c:26:
  26 In file included from src/wayland-client-protocol.h:8:
  27 In file included from ../src/wayland-client.h:40:
  28 src/wayland-client-protocol.h:1358:2: error: unterminated conditional directive
  29  #ifndef WL_SHM_FORMAT_ENUM
  30   ^
  31 In file included from ../tests/protocol-logger-test.c:34:
  32 In file included from ../src/wayland-client.h:40:
  33 src/wayland-client-protocol.h:2613:1: error: unterminated /* comment
  34 /**
  35 ^
  36 ../tests/resources-test.c:49:36: error: use of undeclared identifier 'wl_seat_interface'
  37         res = wl_resource_create(client, &wl_seat_interface, 4, 0);
  38                                           ^
  39 Upstream-Status: Backport
  40 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  41 ---
  42  tests/meson.build | 26 ++++++++++++++++++--------
  43  1 file changed, 18 insertions(+), 8 deletions(-)
  44
  45 diff --git a/tests/meson.build b/tests/meson.build
  46 index c28a2a3..f1af7b4 100644
  47 --- a/tests/meson.build
  48 +++ b/tests/meson.build
  49 @@ -69,7 +69,7 @@ test(
  50         executable(
  51                 'cpp-compile-test',
  52                 'cpp-compile-test.cpp',
  53 -               wayland_server_protocol_core_h,
  54 +               wayland_server_protocol_h,
  55                 include_directories: src_inc
  56         )
  57  )
  58 @@ -91,17 +91,25 @@ tests = {
  59         'array-test': [],
  60         'client-test': [ wayland_server_protocol_h ],
  61         'display-test': [
  62 +               wayland_client_protocol_h,
  63 +               wayland_server_protocol_h,
  64                 tests_server_protocol_h,
  65                 tests_client_protocol_c,
  66                 tests_protocol_c,
  67         ],
  68 -       'connection-test': [ wayland_server_protocol_h ],
  69 +       'connection-test': [
  70 +               wayland_client_protocol_h,
  71 +               wayland_server_protocol_h,
  72 +       ],
  73         'event-loop-test': [ wayland_server_protocol_h ],
  74         'fixed-test': [],
  75         'interface-test': [ wayland_client_protocol_h ],
  76         'list-test': [],
  77         'map-test': [],
  78 -       'sanity-test' : [ wayland_server_protocol_h ],
  79 +       'sanity-test' : [
  80 +               wayland_client_protocol_h,
  81 +               wayland_server_protocol_h,
  82 +       ],
  83         'socket-test': [
  84                 wayland_client_protocol_h,
  85                 wayland_server_protocol_h,
  86 @@ -116,7 +124,7 @@ tests = {
  87                 files('../src/wayland-server.c'),
  88                 wayland_server_protocol_h,
  89         ],
  90 -       'resources-test': [ wayland_server_protocol_core_h ],
  91 +       'resources-test': [ wayland_server_protocol_h ],
  92         'message-test': [
  93                 wayland_client_protocol_h,
  94                 wayland_server_protocol_h,
  95 @@ -126,14 +134,16 @@ tests = {
  96                 wayland_server_protocol_h,
  97         ],
  98         'protocol-logger-test': [
  99 -               wayland_server_protocol_core_h,
 100 -               wayland_client_protocol_core_h,
 101 +               wayland_client_protocol_h,
 102 +               wayland_server_protocol_h,
 103         ],
 104         'headers-test': [
 105 +               wayland_client_protocol_h,
 106 +               wayland_server_protocol_h,
 107                 'headers-protocol-test.c',
 108 -               'headers-protocol-core-test.c',
 109 -               wayland_server_protocol_core_h,
 110                 wayland_client_protocol_core_h,
 111 +               wayland_server_protocol_core_h,
 112 +               'headers-protocol-core-test.c',
 113         ],
 114         'os-wrappers-test': [],
 115  }