From 06a637f212479b6fe418214ab9c9c0d9d080f1af Mon Sep 17 00:00:00 2001 From: Felipe Borges Date: Fri, 5 Aug 2022 11:30:15 +0200 Subject: build: Make appdata and desktop file tests more reliable --- meson.build | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index babc6de2..3ce8cfa5 100644 --- a/meson.build +++ b/meson.build @@ -252,7 +252,7 @@ desktop_files = [ desktop_file_validate = find_program('desktop-file-validate', required: false) foreach desktop: desktop_files - i18n.merge_file( + desktop_file = i18n.merge_file( input: desktop + '.desktop.in', output: desktop + '.desktop', install: true, @@ -264,15 +264,13 @@ foreach desktop: desktop_files if desktop_file_validate.found() test('validate-' + desktop + '-desktop', desktop_file_validate, - args: desktop + '.desktop', - workdir: meson.current_build_dir(), + args: [ desktop_file.full_path() ] ) endif endforeach appdata = 'nm-connection-editor.appdata.xml' - -i18n.merge_file( +appdata_file = i18n.merge_file( input: appdata + '.in', output: appdata, install: true, @@ -284,8 +282,7 @@ appstream_util = find_program('appstream-util', required: false) if appstream_util.found() test('validate-appdata', appstream_util, - args: ['validate', '--nonet', appdata], - workdir: meson.current_build_dir(), + args: ['validate', '--nonet', appdata_file.full_path()], ) endif -- cgit v1.2.1