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

build: Fix Flatpak CI test failures caused by meson 0.57

See merge request GNOME/geary!700

desktop/meson.build

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

test/meson.build

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