Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 1 | From e6889d60891383ce6aa66aa3db30255af58bcf3c Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Wed, 27 Oct 2021 20:04:02 +0200 |
| 4 | Subject: [PATCH] meson.build: Do not add dir installed-tests when |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 10 | installed_tests is false |
| 11 | MIME-Version: 1.0 |
| 12 | Content-Type: text/plain; charset=UTF-8 |
| 13 | Content-Transfer-Encoding: 8bit |
| 14 | |
Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame] | 15 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 16 | |
| 17 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 18 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 19 | --- |
| 20 | meson.build | 4 +++- |
| 21 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 22 | |
| 23 | diff --git a/meson.build b/meson.build |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 24 | index 86239a4..11c04e2 100644 |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 25 | --- a/meson.build |
| 26 | +++ b/meson.build |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 27 | @@ -681,7 +681,9 @@ endif |
| 28 | |
| 29 | ### Tests and test setups ###################################################### |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 30 | |
| 31 | -subdir('installed-tests') |
| 32 | +if get_option('installed_tests') |
| 33 | + subdir('installed-tests') |
| 34 | +endif |
| 35 | |
| 36 | # Note: The test program in test/ needs to be ported |
| 37 | # to Windows before we can build it on Windows. |