[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/wayland/weston][wip/daissi/reorganization] 3 commits: Use build time tests as autopkgtest until upstream tests can be installed

Title: GitLab

Dylan Aïssi pushed to branch wip/daissi/reorganization at X Strike Force / wayland / weston

Commits:

  • e46bd4b4
    by Dylan Aïssi at 2024-02-15T22:52:07+01:00 
    Use build time tests as autopkgtest until upstream tests can be installed

See https://gitlab.freedesktop.org/wayland/weston/-/issues/368

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
  • 47db8878
    by Dylan Aïssi at 2024-02-15T22:05:59+00:00 
    Move Weston plugin development files to libweston-13-dev (Closes: #952530)

These files are not required at runtime.

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>
  • 4ee663df
    by Dylan Aïssi at 2024-02-15T22:05:59+00:00 
    Move optional sample clients to a new binary package

Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com>

8 changed files:

Changes:

  • debian/control
    ... ... @@ -72,6 +72,19 @@ Description: reference implementation of a wayland compositor
    72 72 
      and fast compositor and is suitable for many embedded and mobile use
    73 73 
      cases.
    74 74
    75 
    +Package: weston-samples
    76 
    +Architecture: linux-any
    77 
    +Depends: ${misc:Depends},
    78 
    +         ${shlibs:Depends}
    79 
    +Description: reference implementation of a wayland compositor (sample clients)
    80 
    + Part of the Wayland project is also the Weston reference implementation
    81 
    + of a Wayland compositor. Weston can run as an X client or under Linux
    82 
    + KMS and ships with a few demo clients. The Weston compositor is a minimal
    83 
    + and fast compositor and is suitable for many embedded and mobile use
    84 
    + cases.
    85 
    + .
    86 
    + This package provides weston sample clients.
    87 
    +
    75 88 
     Package: libweston-13-0
    76 89 
     Section: libs
    77 90 
     Architecture: linux-any

  • debian/libweston-13-dev.install
    1 1 
     usr/include/libweston-13
    2 
    +usr/include/weston
    2 3 
     usr/lib/*/libweston-13.so
    3 4 
     usr/lib/*/pkgconfig/libweston-13.pc
    5 
    +usr/lib/*/pkgconfig/weston.pc
    4 6 
     usr/share/libweston-13/protocols/weston-content-protection.xml
    5 7 
     usr/share/libweston-13/protocols/weston-debug.xml
    6 8 
     usr/share/libweston-13/protocols/weston-direct-display.xml

  • debian/patches/Skip_xwayland_test.patch
    1 
    +Description: Skip the xwayland test because it doesn't work on Debian at
    2 
    + build time, nor on the autopkgtest infrastructure. It fails with:
    3 
    + > failed to bind to /tmp/.X11-unix/X0: No such file or directory
    4 
    +Author: Dylan Aïssi <daissi@debian.org>
    5 
    +
    6 
    +--- a/tests/xwayland-test.c
    7 
    ++++ b/tests/xwayland-test.c
    8 
    +@@ -51,6 +51,12 @@
    9 
    + static enum test_result_code
    10 
    + fixture_setup(struct weston_test_harness *harness)
    11 
    + {
    12 
    ++	/* Skip the xwayland test because it doesn't work on Debian at
    13 
    ++	   build time, nor on the autopkgtest infrastructure. It fails with:
    14 
    ++	   > failed to bind to /tmp/.X11-unix/X0: No such file or directory
    15 
    ++	*/
    16 
    ++	return 77;
    17 
    ++
    18 
    + 	struct compositor_setup setup;
    19 
    +
    20 
    + 	unsetenv("DISPLAY");

  • debian/patches/series
    1 
    +Skip_xwayland_test.patch

  • debian/rules
    ... ... @@ -8,7 +8,7 @@ override_dh_auto_configure:
    8 8
    9 9 
     override_dh_auto_test:
    10 10 
     	mkdir -p $(CURDIR)/debian/tmp/tmp/xdgruntimedir
    11 
    -	XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir dh_auto_test || true
    11 
    +	XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp/tmp/xdgruntimedir dh_auto_test
    12 12
    13 13 
     override_dh_missing:
    14 14 
     	dh_missing --fail-missing -X.la

  • debian/tests/control
    1 
    +# Upstream testsuite is not yet installable, see
    2 
    +# https://gitlab.freedesktop.org/wayland/weston/-/issues/368
    3 
    +Test-Command: dh_auto_configure; dh_auto_build; dh_auto_test
    4 
    +Depends: @builddeps@
    5 
    +Restrictions: allow-stderr

  • debian/weston-samples.install
    1 
    +usr/bin/weston-clickdot
    2 
    +usr/bin/weston-cliptest
    3 
    +usr/bin/weston-constraints
    4 
    +usr/bin/weston-content_protection
    5 
    +usr/bin/weston-dnd
    6 
    +usr/bin/weston-editor
    7 
    +usr/bin/weston-eventdemo
    8 
    +usr/bin/weston-flower
    9 
    +usr/bin/weston-fullscreen
    10 
    +usr/bin/weston-image
    11 
    +usr/bin/weston-multi-resource
    12 
    +usr/bin/weston-presentation-shm
    13 
    +usr/bin/weston-resizor
    14 
    +usr/bin/weston-scaler
    15 
    +usr/bin/weston-simple-damage
    16 
    +usr/bin/weston-simple-dmabuf-egl
    17 
    +usr/bin/weston-simple-dmabuf-feedback
    18 
    +usr/bin/weston-simple-dmabuf-v4l
    19 
    +usr/bin/weston-simple-egl
    20 
    +usr/bin/weston-simple-shm
    21 
    +usr/bin/weston-simple-touch
    22 
    +usr/bin/weston-smoke
    23 
    +usr/bin/weston-stacking
    24 
    +usr/bin/weston-subsurfaces
    25 
    +usr/bin/weston-tablet
    26 
    +usr/bin/weston-transformed

  • debian/weston.install
    1 1 
     etc/pam.d/weston-remote-access
    2 2 
     usr/bin/wcap-decode
    3 3 
     usr/bin/weston
    4 
    -usr/bin/weston-*
    5 
    -usr/include/weston
    6 
    -usr/lib/*/pkgconfig/weston.pc
    4 
    +usr/bin/weston-calibrator
    5 
    +usr/bin/weston-debug
    6 
    +usr/bin/weston-screenshooter
    7 
    +usr/bin/weston-terminal
    8 
    +usr/bin/weston-touch-calibrator
    7 9 
     usr/lib/*/weston/desktop-shell.so
    8 10 
     usr/lib/*/weston/fullscreen-shell.so
    9 11 
     usr/lib/*/weston/hmi-controller.so

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: