spec: Reorganize BSP-specific tests

11 files changed, 25 insertions, 43 deletions

diff --git a/spec/bsp/sparc/leon3/val/fatal-cache-snooping-disabled-boot.yml b/spec/bsp/sparc/leon3/val/fatal-cache-snooping-disabled-boot.yml
index a3a48210..c806ba3b 100644
--- a/spec/bsp/sparc/leon3/val/fatal-cache-snooping-disabled-boot.yml
+++ b/spec/bsp/sparc/leon3/val/fatal-cache-snooping-disabled-boot.yml
@@ -54,13 +54,13 @@ test-header:
     dir: null
     name: code
     specifier: ${/rtems/userext/if/fatal-code:/name} ${.:name}
-  target: testsuites/validation/tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.h
+  target: testsuites/validation/bsps/tr-fatal-sparc-leon3-cache-snooping-disabled-boot.h
 test-includes:
 - rtems/sysinit.h
 - bsp/fatal.h
 - bsp/leon3.h
 test-local-includes:
-- tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.h
+- tr-fatal-sparc-leon3-cache-snooping-disabled-boot.h
 test-setup: null
 test-stop: null
 test-support: |
@@ -78,6 +78,6 @@ test-support: |
     RTEMS_SYSINIT_BSP_EARLY,
     RTEMS_SYSINIT_ORDER_FIRST
   );
-test-target: testsuites/validation/tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.c
+test-target: testsuites/validation/bsps/tr-fatal-sparc-leon3-cache-snooping-disabled-boot.c
 test-teardown: null
 type: test-case
diff --git a/spec/bsp/sparc/leon3/val/fatal-cache-snooping-disabled-secondary.yml b/spec/bsp/sparc/leon3/val/fatal-cache-snooping-disabled-secondary.yml
index abe090f3..9540e74c 100644
--- a/spec/bsp/sparc/leon3/val/fatal-cache-snooping-disabled-secondary.yml
+++ b/spec/bsp/sparc/leon3/val/fatal-cache-snooping-disabled-secondary.yml
@@ -54,13 +54,13 @@ test-header:
     dir: null
     name: code
     specifier: ${/rtems/userext/if/fatal-code:/name} ${.:name}
-  target: testsuites/validation/tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.h
+  target: testsuites/validation/bsps/tr-fatal-sparc-leon3-cache-snooping-disabled-secondary.h
 test-includes:
 - bsp/bootcard.h
 - bsp/fatal.h
 - bsp/leon3.h
 test-local-includes:
-- tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.h
+- tr-fatal-sparc-leon3-cache-snooping-disabled-secondary.h
 test-setup: null
 test-stop: null
 test-support: |
@@ -78,6 +78,6 @@ test-support: |
 
     __real_bsp_start_on_secondary_processor( cpu_self );
   }
-test-target: testsuites/validation/tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.c
+test-target: testsuites/validation/bsps/tr-fatal-sparc-leon3-cache-snooping-disabled-secondary.c
 test-teardown: null
 type: test-case
diff --git a/spec/bsp/sparc/leon3/val/fatal-clock-initialization.yml b/spec/bsp/sparc/leon3/val/fatal-clock-initialization.yml
index 2d52ef58..edb4e5ef 100644
--- a/spec/bsp/sparc/leon3/val/fatal-clock-initialization.yml
+++ b/spec/bsp/sparc/leon3/val/fatal-clock-initialization.yml
@@ -51,14 +51,14 @@ test-header:
     dir: null
     name: code
     specifier: ${/rtems/userext/if/fatal-code:/name} ${.:name}
-  target: testsuites/validation/tr-fatal-bsp-sparc-leon3-clock-initialization.h
+  target: testsuites/validation/bsps/tr-fatal-sparc-leon3-clock-initialization.h
 test-includes:
 - rtems/irq-extension.h
 - rtems/sysinit.h
 - bsp/fatal.h
 - bsp/leon3.h
 test-local-includes:
-- tr-fatal-bsp-sparc-leon3-clock-initialization.h
+- tr-fatal-sparc-leon3-clock-initialization.h
 test-setup: null
 test-stop: null
 test-support: |
@@ -90,6 +90,6 @@ test-support: |
     RTEMS_SYSINIT_DEVICE_DRIVERS,
     RTEMS_SYSINIT_ORDER_FIRST
   );
-test-target: testsuites/validation/tr-fatal-bsp-sparc-leon3-clock-initialization.c
+test-target: testsuites/validation/bsps/tr-fatal-sparc-leon3-clock-initialization.c
 test-teardown: null
 type: test-case
diff --git a/spec/bsp/sparc/leon3/val/fatal-shutdown.yml b/spec/bsp/sparc/leon3/val/fatal-shutdown.yml
index 839446cb..be71f7ab 100644
--- a/spec/bsp/sparc/leon3/val/fatal-shutdown.yml
+++ b/spec/bsp/sparc/leon3/val/fatal-shutdown.yml
@@ -133,6 +133,6 @@ test-support: |
     RTEMS_SYSINIT_DEVICE_DRIVERS,
     RTEMS_SYSINIT_ORDER_MIDDLE
   );
-test-target: testsuites/validation/tc-fatal-bsp-sparc-leon3-shutdown.c
+test-target: testsuites/validation/bsps/tc-fatal-sparc-leon3-shutdown.c
 test-teardown: null
 type: test-case
diff --git a/spec/bsp/sparc/leon3/val/gr712rc.yml b/spec/bsp/sparc/leon3/val/gr712rc.yml
index abb2570c..ba497dd3 100644
--- a/spec/bsp/sparc/leon3/val/gr712rc.yml
+++ b/spec/bsp/sparc/leon3/val/gr712rc.yml
@@ -53,6 +53,6 @@ test-local-includes:
 test-setup: null
 test-stop: null
 test-support: null
-test-target: testsuites/validation/tc-bsp-sparc-leon3-gr712rc.c
+test-target: testsuites/validation/bsps/tc-sparc-gr712rc.c
 test-teardown: null
 type: test-case
diff --git a/spec/testsuites/bsp-sparc-leon3-gr712rc.yml b/spec/testsuites/bsp-sparc-leon3-gr712rc.yml
deleted file mode 100644
index 3ed72eba..00000000
--- a/spec/testsuites/bsp-sparc-leon3-gr712rc.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-copyrights:
-- Copyright (C) 2021 embedded brains GmbH & Co. KG
-enabled-by: sparc/gr712rc
-links:
-- role: requirement-refinement
-  uid: validation
-test-brief: |
-  This validation test suite contains BSP-specific test cases.
-test-code: |
-  const char rtems_test_name[] = "${.:/test-suite-name}";
-
-  #include "ts-default.h"
-test-description: null
-test-includes: []
-test-local-includes: []
-test-target: testsuites/validation/ts-bsp-sparc-leon3-gr712rc.c
-type: test-suite
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml b/spec/testsuites/bsps/fatal-sparc-leon3-cache-snooping-disabled-boot.yml
index 6bb278b2..9c8a18b0 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.yml
+++ b/spec/testsuites/bsps/fatal-sparc-leon3-cache-snooping-disabled-boot.yml
@@ -7,7 +7,7 @@ enabled-by:
   - bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: validation
+  uid: ../validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
@@ -22,6 +22,6 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes:
-- tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.h
-test-target: testsuites/validation/ts-fatal-bsp-sparc-leon3-cache-snooping-disabled-boot.c
+- tr-fatal-sparc-leon3-cache-snooping-disabled-boot.h
+test-target: testsuites/validation/bsps/ts-fatal-sparc-leon3-cache-snooping-disabled-boot.c
 type: test-suite
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml b/spec/testsuites/bsps/fatal-sparc-leon3-cache-snooping-disabled-secondary.yml
index d27dd6d5..33598eae 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.yml
+++ b/spec/testsuites/bsps/fatal-sparc-leon3-cache-snooping-disabled-secondary.yml
@@ -7,7 +7,7 @@ enabled-by:
   - bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: validation
+  uid: ../validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
@@ -25,6 +25,6 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes:
-- tr-fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.h
-test-target: testsuites/validation/ts-fatal-bsp-sparc-leon3-cache-snooping-disabled-secondary.c
+- tr-fatal-sparc-leon3-cache-snooping-disabled-secondary.h
+test-target: testsuites/validation/bsps/ts-fatal-sparc-leon3-cache-snooping-disabled-secondary.c
 type: test-suite
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml b/spec/testsuites/bsps/fatal-sparc-leon3-clock-initialization.yml
index 968a8b54..a1a5643f 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-clock-initialization.yml
+++ b/spec/testsuites/bsps/fatal-sparc-leon3-clock-initialization.yml
@@ -4,7 +4,7 @@ copyrights:
 enabled-by: bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: validation
+  uid: ../validation
 test-brief: |
   This validation test suite contains a test case which triggers a fatal error
   during system initialization.
@@ -19,6 +19,6 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes:
-- tr-fatal-bsp-sparc-leon3-clock-initialization.h
-test-target: testsuites/validation/ts-fatal-bsp-sparc-leon3-clock-initialization.c
+- tr-fatal-sparc-leon3-clock-initialization.h
+test-target: testsuites/validation/bsps/ts-fatal-sparc-leon3-clock-initialization.c
 type: test-suite
diff --git a/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml b/spec/testsuites/bsps/fatal-sparc-leon3-shutdown.yml
index 8561dae4..352baa85 100644
--- a/spec/testsuites/fatal-bsp-sparc-leon3-shutdown.yml
+++ b/spec/testsuites/bsps/fatal-sparc-leon3-shutdown.yml
@@ -7,7 +7,7 @@ enabled-by:
   - bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: validation
+  uid: ../validation
 test-brief: |
   This validation test suite provides an application configuration to perform a
   shutdown.
@@ -113,5 +113,5 @@ test-includes:
 test-local-includes:
 - ts-config.h
 - tx-support.h
-test-target: testsuites/validation/ts-fatal-bsp-sparc-leon3-shutdown.c
+test-target: testsuites/validation/bsps/ts-fatal-sparc-leon3-shutdown.c
 type: test-suite
diff --git a/spec/testsuites/validation-dev-0.yml b/spec/testsuites/bsps/validation-bsp-0.yml
index 54fcb8cf..d2cb81e5 100644
--- a/spec/testsuites/validation-dev-0.yml
+++ b/spec/testsuites/bsps/validation-bsp-0.yml
@@ -1,10 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH & Co. KG
-enabled-by: true
+enabled-by: bsps/sparc/leon3
 links:
 - role: requirement-refinement
-  uid: validation
+  uid: ../validation
 test-brief: |
   This general purpose validation test suite provides enough resources to run
   ${/glossary/target:/term}-specific tests.
@@ -15,5 +15,5 @@ test-code: |
 test-description: null
 test-includes: []
 test-local-includes: []
-test-target: testsuites/validation/ts-validation-dev-0.c
+test-target: testsuites/validation/bsps/ts-validation-bsp-0.c
 type: test-suite