3 commits - test/meson.build

[GitLab Mirror]

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

New commits:
commit 1193515f5d4fe8099894421df9800c46dad738d9
Merge: f0a651e1a b00db10ae
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Jun 1 13:17:30 2024 +0000

    Merge branch 'meson-fixes' into 'master'
    
    A couple of meson fixes
    
    See merge request cairo/cairo!561

commit b00db10ae8b22560d08b3352696705da2997adba
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Jun 1 21:17:52 2024 +0930

    meson: Use cc.has_define instead of cc.get_define for variables that may be undefined
    
    Fixes the message:
    
      Fetching value of define "DEBUG_SVG_RENDER" : (undefined)

diff --git a/test/meson.build b/test/meson.build
index 577cca96f..b4f799c77 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -696,6 +696,6 @@ test('cairo', exe,
 
 # The SVG renderer debug tools can only be built if the _cairo_debug_svg_render()
 # function has been exposed by defining DEBUG_SVG_RENDER
-if conf.get('HAVE_FT_SVG_DOCUMENT', 0) == 1 and cc.get_define('DEBUG_SVG_RENDER') != ''
+if conf.get('HAVE_FT_SVG_DOCUMENT', 0) == 1 and cc.has_define('DEBUG_SVG_RENDER')
   subdir('svg')
 endif
commit 4f38b502e586e6e0fb9cea4d0bf5ae832b0f4401
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat Jun 1 20:40:15 2024 +0930

    Fix meson deprecation warning
    
    test/meson.build:663: WARNING: Project targets '>= 1.3.0' but uses feature deprecated since '0.64.0': copy arg in configure_file. Use fs.copyfile instead

diff --git a/test/meson.build b/test/meson.build
index dff2f2efe..577cca96f 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -658,9 +658,10 @@ exe = executable('cairo-test-suite', [cairo_test_suite_sources, test_sources, ca
     libpdiff_dep],
 )
 
+fs = import('fs')
 build_dir_files = ['completion.bash', 'index.html', 'testtable.js', 'view-test-results.py']
 foreach file : build_dir_files
-  configure_file(input: file, output : file, copy: true)
+  fs.copyfile(file)
 endforeach
 
 if build_machine.system() != 'windows'