[libgweather/dist-3.90.0: 1/2] build: Ensure tests depend on generated enum schemas




commit ea912bc1659f2ad3494ec6c5e23abc9b05dfa14a
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Nov 19 19:07:08 2021 +0000

    build: Ensure tests depend on generated enum schemas
    
    Otherwise they are going to break if we run the tests before the schemas
    have been built, or if the enums change.

 libgweather/tests/meson.build | 2 +-
 meson.build                   | 2 +-
 schemas/meson.build           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libgweather/tests/meson.build b/libgweather/tests/meson.build
index 5ff528f0..eefe2a3f 100644
--- a/libgweather/tests/meson.build
+++ b/libgweather/tests/meson.build
@@ -44,6 +44,6 @@ foreach t: gweather_tests
     args: ['--tap', '-k'],
     protocol: 'tap',
     env: test_env,
-    depends: [locations_bin],
+    depends: [locations_bin, schemas_enums],
   )
 endforeach
diff --git a/meson.build b/meson.build
index a0ac5c14..2306198b 100644
--- a/meson.build
+++ b/meson.build
@@ -50,8 +50,8 @@ py = import('python').find_installation('python3', modules: ['gi'])
 gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
 
 subdir('data')
-subdir('libgweather')
 subdir('schemas')
+subdir('libgweather')
 subdir('doc')
 subdir('po')
 subdir('po-locations')
diff --git a/schemas/meson.build b/schemas/meson.build
index 3226aef0..bfe2c2fd 100644
--- a/schemas/meson.build
+++ b/schemas/meson.build
@@ -3,7 +3,7 @@ install_data('org.gnome.GWeather4.gschema.xml',
   install_dir: gsettingsdir,
 )
 
-gnome.mkenums('org.gnome.GWeather4.enums.xml',
+schemas_enums = gnome.mkenums('org.gnome.GWeather4.enums.xml',
   comments: '<!-- @comment@ -->',
   fhead: '<schemalist>',
   vhead: '<@type@ id="org.gnome.GWeather4.@EnumName@">',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]