xserver: Branch 'master'

[GitLab Mirror]

 test/meson.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c187c540865a33ac0a2f30e9b3f7429f0b6bf84b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 28 16:14:32 2024 +0100

    test: fix deprecated meson calls
    
    Fix meson warning:
    
    > WARNING: Project targeting '>= 0.56.0' but tried to use feature deprecated since '0.55.0': ExternalProgram.path. use ExternalProgram.full_path() instead
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1448>

diff --git a/test/meson.build b/test/meson.build
index 79e1a11aa..58a6ca533 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -92,7 +92,7 @@ if get_option('xvfb')
                  # Use full_path so people can copy and paste the
                  # command line from testlog.txt easily.
                  args: [
-                     rendercheck.path(),
+                     rendercheck.full_path(),
                      rctest[1].split(' '),
                      '--',
                      xvfb_args,
@@ -128,7 +128,7 @@ if get_option('xvfb')
                     test(rctest[0],
                         simple_xinit,
                         args: [simple_xinit.full_path(),
-                                rendercheck.path(),
+                                rendercheck.full_path(),
                                 rctest[1].split(' '),
                                 '----',
                                 xephyr_server.full_path(),