From 4e449f49ac22925f07e5d706494ac0400fb3a17d Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 5 May 2022 08:17:05 +0200 Subject: build: Check for psxtests prerequisites Close #4645. --- spec/build/testsuites/libtests/grp.yml | 8 ++++---- spec/build/testsuites/libtests/optbin2c.yml | 14 -------------- spec/build/testsuites/libtests/optgzip.yml | 14 -------------- spec/build/testsuites/libtests/optxz.yml | 14 -------------- spec/build/testsuites/optbin2c.yml | 14 ++++++++++++++ spec/build/testsuites/optgzip.yml | 14 ++++++++++++++ spec/build/testsuites/optxz.yml | 14 ++++++++++++++ spec/build/testsuites/psxtests/grp.yml | 6 ++++++ 8 files changed, 52 insertions(+), 46 deletions(-) delete mode 100644 spec/build/testsuites/libtests/optbin2c.yml delete mode 100644 spec/build/testsuites/libtests/optgzip.yml delete mode 100644 spec/build/testsuites/libtests/optxz.yml create mode 100644 spec/build/testsuites/optbin2c.yml create mode 100644 spec/build/testsuites/optgzip.yml create mode 100644 spec/build/testsuites/optxz.yml (limited to 'spec') diff --git a/spec/build/testsuites/libtests/grp.yml b/spec/build/testsuites/libtests/grp.yml index d352c8221c..6d5005c467 100644 --- a/spec/build/testsuites/libtests/grp.yml +++ b/spec/build/testsuites/libtests/grp.yml @@ -14,15 +14,15 @@ ldflags: - -Wl,--wrap=putchar links: - role: build-dependency - uid: optbin2c + uid: ../optbin2c - role: build-dependency - uid: optgzip + uid: ../optgzip +- role: build-dependency + uid: ../optxz - role: build-dependency uid: optrtemsld - role: build-dependency uid: optrtemssyms -- role: build-dependency - uid: optxz - role: build-dependency uid: block01 - role: build-dependency diff --git a/spec/build/testsuites/libtests/optbin2c.yml b/spec/build/testsuites/libtests/optbin2c.yml deleted file mode 100644 index 0470905529..0000000000 --- a/spec/build/testsuites/libtests/optbin2c.yml +++ /dev/null @@ -1,14 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause -actions: -- set-value: rtems-bin2c -- find-program: null -- env-assign: BIN2C -build-type: option -copyrights: -- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] -description: '' -enabled-by: true -links: [] -type: build diff --git a/spec/build/testsuites/libtests/optgzip.yml b/spec/build/testsuites/libtests/optgzip.yml deleted file mode 100644 index d53136b076..0000000000 --- a/spec/build/testsuites/libtests/optgzip.yml +++ /dev/null @@ -1,14 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause -actions: -- set-value: gzip -- find-program: null -- env-assign: GZIP -build-type: option -copyrights: -- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] -description: '' -enabled-by: true -links: [] -type: build diff --git a/spec/build/testsuites/libtests/optxz.yml b/spec/build/testsuites/libtests/optxz.yml deleted file mode 100644 index 8bad91a7bb..0000000000 --- a/spec/build/testsuites/libtests/optxz.yml +++ /dev/null @@ -1,14 +0,0 @@ -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause -actions: -- set-value: xz -- find-program: null -- env-assign: XZ -build-type: option -copyrights: -- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] -description: '' -enabled-by: true -links: [] -type: build diff --git a/spec/build/testsuites/optbin2c.yml b/spec/build/testsuites/optbin2c.yml new file mode 100644 index 0000000000..0470905529 --- /dev/null +++ b/spec/build/testsuites/optbin2c.yml @@ -0,0 +1,14 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- set-value: rtems-bin2c +- find-program: null +- env-assign: BIN2C +build-type: option +copyrights: +- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) +default: null +default-by-variant: [] +description: '' +enabled-by: true +links: [] +type: build diff --git a/spec/build/testsuites/optgzip.yml b/spec/build/testsuites/optgzip.yml new file mode 100644 index 0000000000..d53136b076 --- /dev/null +++ b/spec/build/testsuites/optgzip.yml @@ -0,0 +1,14 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- set-value: gzip +- find-program: null +- env-assign: GZIP +build-type: option +copyrights: +- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) +default: null +default-by-variant: [] +description: '' +enabled-by: true +links: [] +type: build diff --git a/spec/build/testsuites/optxz.yml b/spec/build/testsuites/optxz.yml new file mode 100644 index 0000000000..8bad91a7bb --- /dev/null +++ b/spec/build/testsuites/optxz.yml @@ -0,0 +1,14 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +actions: +- set-value: xz +- find-program: null +- env-assign: XZ +build-type: option +copyrights: +- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) +default: null +default-by-variant: [] +description: '' +enabled-by: true +links: [] +type: build diff --git a/spec/build/testsuites/psxtests/grp.yml b/spec/build/testsuites/psxtests/grp.yml index 3ebd6a3373..fc1c927ea1 100644 --- a/spec/build/testsuites/psxtests/grp.yml +++ b/spec/build/testsuites/psxtests/grp.yml @@ -14,6 +14,12 @@ ldflags: - -Wl,--wrap=puts - -Wl,--wrap=putchar links: +- role: build-dependency + uid: ../optbin2c +- role: build-dependency + uid: ../optgzip +- role: build-dependency + uid: ../optxz - role: build-dependency uid: libpsxhdrs - role: build-dependency -- cgit v1.2.3