diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch')
| -rw-r--r-- | meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch index 8777d14f53..e932f06d27 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch +++ b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch @@ -1,13 +1,17 @@ -From 6a29818204e647d5fad68ed7ca8cac53d301cae6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +From 29221ae42e424c6100b8c313d2b61801430c872d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?= + <schnitzeltony@gmail.com> Date: Wed, 27 Oct 2021 20:04:02 +0200 Subject: [PATCH] meson.build: Do not add dir installed-tests when - installed_tests is false MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Submitted[https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- @@ -15,12 +19,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 6878e2e..edbbf79 100644 +index 3058e8c..06cf8da 100644 --- a/meson.build +++ b/meson.build -@@ -635,7 +635,9 @@ if not get_option('skip_gtk_tests') - have_gtk4 = dependency('gtk4', required: false).found() - endif +@@ -688,7 +688,9 @@ endif + + ### Tests and test setups ###################################################### -subdir('installed-tests') +if get_option('installed_tests') @@ -29,6 +33,3 @@ index 6878e2e..edbbf79 100644 # Note: The test program in test/ needs to be ported # to Windows before we can build it on Windows. --- -2.31.1 - |