diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-09-12 10:35:21 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2023-01-17 08:31:48 +0100 |
| commit | f20078acea88f7c38f14cbc206053e50c313c357 (patch) | |
| tree | b00ad4ff46b7da85f4b5206561961d0317b86375 /spec/build/testsuites | |
| parent | build: Replace variant patterns with a list (diff) | |
| download | rtems-f20078acea88f7c38f14cbc206053e50c313c357.tar.bz2 | |
build: Use enabled by for defaults
Merge the "default" and "default-by-variant" attributes. Use an
"enabled-by" expression to select the default value based on the enabled
set. This makes it possible to select default values depending on other
options. For example you could choose memory settings based on whether
RTEMS_SMP is enabled or disabled.
The change was tested by comparing the output of
./waf bspdefaults
before and after the change.
Diffstat (limited to 'spec/build/testsuites')
22 files changed, 54 insertions, 44 deletions
diff --git a/spec/build/testsuites/ada/optgnat.yml b/spec/build/testsuites/ada/optgnat.yml index 82d940b502..47f6b060ae 100644 --- a/spec/build/testsuites/ada/optgnat.yml +++ b/spec/build/testsuites/ada/optgnat.yml @@ -7,8 +7,7 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] diff --git a/spec/build/testsuites/libtests/optrtemsld.yml b/spec/build/testsuites/libtests/optrtemsld.yml index 1373023c7e..90f40c79f1 100644 --- a/spec/build/testsuites/libtests/optrtemsld.yml +++ b/spec/build/testsuites/libtests/optrtemsld.yml @@ -6,8 +6,7 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] diff --git a/spec/build/testsuites/libtests/optrtemssyms.yml b/spec/build/testsuites/libtests/optrtemssyms.yml index 51872b04b7..b49599a67e 100644 --- a/spec/build/testsuites/libtests/optrtemssyms.yml +++ b/spec/build/testsuites/libtests/optrtemssyms.yml @@ -6,8 +6,7 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] diff --git a/spec/build/testsuites/optada.yml b/spec/build/testsuites/optada.yml index a1844c4f73..d95021295e 100644 --- a/spec/build/testsuites/optada.yml +++ b/spec/build/testsuites/optada.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the Ada test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optall.yml b/spec/build/testsuites/optall.yml index 437a4cb8ca..9596f868c3 100644 --- a/spec/build/testsuites/optall.yml +++ b/spec/build/testsuites/optall.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the test programs enabled-by: true diff --git a/spec/build/testsuites/optbenchmarks.yml b/spec/build/testsuites/optbenchmarks.yml index 5452746d5c..5d9f74c84a 100644 --- a/spec/build/testsuites/optbenchmarks.yml +++ b/spec/build/testsuites/optbenchmarks.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the benchmark programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optbin2c.yml b/spec/build/testsuites/optbin2c.yml index 0470905529..ad056ebdeb 100644 --- a/spec/build/testsuites/optbin2c.yml +++ b/spec/build/testsuites/optbin2c.yml @@ -6,8 +6,7 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] diff --git a/spec/build/testsuites/optfs.yml b/spec/build/testsuites/optfs.yml index bc479b8948..16e1cb8253 100644 --- a/spec/build/testsuites/optfs.yml +++ b/spec/build/testsuites/optfs.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the file system test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optgzip.yml b/spec/build/testsuites/optgzip.yml index d53136b076..1469c15e09 100644 --- a/spec/build/testsuites/optgzip.yml +++ b/spec/build/testsuites/optgzip.yml @@ -6,8 +6,7 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] diff --git a/spec/build/testsuites/optlib.yml b/spec/build/testsuites/optlib.yml index c3d1e5e7a6..3cca761de6 100644 --- a/spec/build/testsuites/optlib.yml +++ b/spec/build/testsuites/optlib.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the library test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optmp.yml b/spec/build/testsuites/optmp.yml index 6a7ff38730..1aff86a89c 100644 --- a/spec/build/testsuites/optmp.yml +++ b/spec/build/testsuites/optmp.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the MPCI test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optpsx.yml b/spec/build/testsuites/optpsx.yml index c3a821421e..55765bbeee 100644 --- a/spec/build/testsuites/optpsx.yml +++ b/spec/build/testsuites/optpsx.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the POSIX test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optpsxtm.yml b/spec/build/testsuites/optpsxtm.yml index 8452c3de8c..c3bfff05e2 100644 --- a/spec/build/testsuites/optpsxtm.yml +++ b/spec/build/testsuites/optpsxtm.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the POSIX timing test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optrhs.yml b/spec/build/testsuites/optrhs.yml index e9e779660c..b92cb2a920 100644 --- a/spec/build/testsuites/optrhs.yml +++ b/spec/build/testsuites/optrhs.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the Rhealstone benchmark programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optsamples.yml b/spec/build/testsuites/optsamples.yml index 0edef21734..49bbbc3aaf 100644 --- a/spec/build/testsuites/optsamples.yml +++ b/spec/build/testsuites/optsamples.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: true -default-by-variant: [] +default: +- enabled-by: true + value: true description: | Build the sample programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optsmp.yml b/spec/build/testsuites/optsmp.yml index 9851841aad..148ccb6f4c 100644 --- a/spec/build/testsuites/optsmp.yml +++ b/spec/build/testsuites/optsmp.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the SMP test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optsp.yml b/spec/build/testsuites/optsp.yml index 88f378f838..36aa7ef63e 100644 --- a/spec/build/testsuites/optsp.yml +++ b/spec/build/testsuites/optsp.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the single-processor test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/opttm.yml b/spec/build/testsuites/opttm.yml index f5ee6afd7d..96472cd8c9 100644 --- a/spec/build/testsuites/opttm.yml +++ b/spec/build/testsuites/opttm.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the timing test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optunit.yml b/spec/build/testsuites/optunit.yml index d103dd1b2c..6605c17248 100644 --- a/spec/build/testsuites/optunit.yml +++ b/spec/build/testsuites/optunit.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the unit test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optvalidation.yml b/spec/build/testsuites/optvalidation.yml index 81eb320d53..f83467307d 100644 --- a/spec/build/testsuites/optvalidation.yml +++ b/spec/build/testsuites/optvalidation.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | Build the validation test programs (may be also enabled by BUILD_TESTS) enabled-by: true diff --git a/spec/build/testsuites/optverbosity.yml b/spec/build/testsuites/optverbosity.yml index a4f1e9e6f4..9920fc163e 100644 --- a/spec/build/testsuites/optverbosity.yml +++ b/spec/build/testsuites/optverbosity.yml @@ -16,8 +16,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: Normal -default-by-variant: [] +default: +- enabled-by: true + value: Normal description: | Sets the test verbosity of the RTEMS Test Framework. Valid values are "Verbose", "Normal", and "Quiet". For normal test runs you can use a diff --git a/spec/build/testsuites/optxz.yml b/spec/build/testsuites/optxz.yml index 8bad91a7bb..f44464abe4 100644 --- a/spec/build/testsuites/optxz.yml +++ b/spec/build/testsuites/optxz.yml @@ -6,8 +6,7 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] |