mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2024-12-28 14:38:20 +01:00
4b04b2becb
Virtboard has been replaced by squeekboard in phosh. While finding this out i also found out that there already exists a meta-phosh layer ;) Anyway they have an existing recipe for squeekeboard over at: https://github.com/JPEWdev/meta-phosh/blob/master/recipes-graphics/squeekboard/squeekboard_git.bb import it
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
From 8c83844e57dc454a0041f61351e2f9c297eb7b23 Mon Sep 17 00:00:00 2001
|
|
From: Joshua Watt <JPEWhacker@gmail.com>
|
|
Date: Fri, 19 Nov 2021 10:49:06 -0600
|
|
Subject: [PATCH] Skip build tests if not enabled
|
|
|
|
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
|
|
---
|
|
src/meson.build | 48 +++++++++++++++++++++++++-----------------------
|
|
1 file changed, 25 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/src/meson.build b/src/meson.build
|
|
index d85be96..b3bb776 100644
|
|
--- a/src/meson.build
|
|
+++ b/src/meson.build
|
|
@@ -61,30 +61,32 @@ rslibs = custom_target(
|
|
depends: cargo_toml,
|
|
)
|
|
|
|
-build_rstests = custom_target(
|
|
- 'build_rstests',
|
|
- build_by_default: false,
|
|
- # HACK: this target needs to build before all the tests,
|
|
- # but it doesn't produce anything stable.
|
|
- # Declaring build_by_default with some random but irrelevant output
|
|
- # ensures that it's always built as it should
|
|
- build_always_stale: true,
|
|
- output: ['src'],
|
|
- install: false,
|
|
- console: true,
|
|
- command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
|
|
- depends: [rslibs, cargo_toml], # no point building tests if the code itself fails
|
|
-)
|
|
+if get_option('tests')
|
|
+ build_rstests = custom_target(
|
|
+ 'build_rstests',
|
|
+ build_by_default: false,
|
|
+ # HACK: this target needs to build before all the tests,
|
|
+ # but it doesn't produce anything stable.
|
|
+ # Declaring build_by_default with some random but irrelevant output
|
|
+ # ensures that it's always built as it should
|
|
+ build_always_stale: true,
|
|
+ output: ['src'],
|
|
+ install: false,
|
|
+ console: true,
|
|
+ command: [cargo_script, 'test', '--no-run'] + cargo_build_flags,
|
|
+ depends: [rslibs, cargo_toml], # no point building tests if the code itself fails
|
|
+ )
|
|
|
|
-test(
|
|
- 'rstest',
|
|
- cargo_script,
|
|
- args: ['test'] + cargo_build_flags,
|
|
- env: ['SOURCE_DIR=' + meson.source_root()],
|
|
- # this is a whole Carg-based test suite, let it run for a while
|
|
- timeout: 900,
|
|
- depends: [build_rstests, cargo_toml],
|
|
-)
|
|
+ test(
|
|
+ 'rstest',
|
|
+ cargo_script,
|
|
+ args: ['test'] + cargo_build_flags,
|
|
+ env: ['SOURCE_DIR=' + meson.source_root()],
|
|
+ # this is a whole Carg-based test suite, let it run for a while
|
|
+ timeout: 900,
|
|
+ depends: [build_rstests, cargo_toml],
|
|
+ )
|
|
+endif
|
|
|
|
libsqueekboard = static_library('libsqueekboard',
|
|
sources,
|
|
--
|
|
2.33.0
|
|
|