nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mjog/fix-meson-0.57-ci-test-failures' into 'mainline'

Browse source 
build: Fix Flatpak CI test failures caused by meson 0.57

See merge request GNOME/geary!700
This commit is contained in:
Michael Gratton 2021-04-22 15:23:07 +00:00
commit ab3d70365e
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop/meson.build
View file

@ -39,7 +39,10 @@ foreach desktop_file: desktop_output
test( test(
'desktop-file-validate', 'desktop-file-validate',
desktop_file_validate, desktop_file_validate,
args: [ desktop_file.full_path() ] args: [ desktop_file.full_path() ],
depends: [
desktop_file,
]
) )
endif endif
endforeach endforeach
@ -69,6 +72,9 @@ if appstream_util.found()
appstream_util, appstream_util,
args: [ args: [
'validate-relax', '--nonet', appdata_merged.full_path() 'validate-relax', '--nonet', appdata_merged.full_path()
],
depends: [
appdata_merged,
] ]
) )
endif endif

12
test/meson.build
View file

@ -168,5 +168,13 @@ test_integration_bin = executable('test-integration',
c_args: geary_c_args, c_args: geary_c_args,
) )
test('engine-tests', test_engine_bin) test(
test('client-tests', test_client_bin) 'engine-tests',
test_engine_bin,
depends: [ engine_lib ]
)
test(
'client-tests',
test_client_bin,
depends: [ client_lib, web_process ]
)