diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2023-03-18 22:40:43 +0000 |
|---|---|---|
| committer | Philip Chimento <philip.chimento@gmail.com> | 2023-03-18 22:40:43 +0000 |
| commit | 072d44573672668e8bc8692afaaa7d8a73365660 (patch) | |
| tree | 4c8eff6f3898c32be30e483aed04a3021c8a487a | |
| parent | 8a8edf6022a271c60ee7cbe90c1e0c73c36b6a50 (diff) | |
| parent | 83683d093c157828cf7787e53a32c586ae4e85d3 (diff) | |
| download | gjs-072d44573672668e8bc8692afaaa7d8a73365660.tar.gz | |
Merge branch 'fix/skip_gtk_tests-build' into 'master'
fix(build, tests): move `have_gtk4` to the appropriate place
See merge request GNOME/gjs!830
| -rw-r--r-- | installed-tests/js/meson.build | 10 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build index 6db887d2..1e953ceb 100644 --- a/installed-tests/js/meson.build +++ b/installed-tests/js/meson.build @@ -203,9 +203,13 @@ endif # during build should be run using dbus-run-session dbus_tests = ['GDBus'] -if have_gtk4 and not get_option('skip_gtk_tests') - # FIXME: find out why GTK4 tries to acquire a message bus - dbus_tests += 'Gtk4' +if not get_option('skip_gtk_tests') + have_gtk4 = dependency('gtk4', required: false).found() + + if have_gtk4 + # FIXME: find out why GTK4 tries to acquire a message bus + dbus_tests += 'Gtk4' + endif endif bus_config = files('../../test/test-bus.conf') diff --git a/meson.build b/meson.build index fbd86a45..74b3c006 100644 --- a/meson.build +++ b/meson.build @@ -679,10 +679,6 @@ endif ### Tests and test setups ###################################################### -if not get_option('skip_gtk_tests') - have_gtk4 = dependency('gtk4', required: false).found() -endif - subdir('installed-tests') # Note: The test program in test/ needs to be ported |