From 9e8b25f3eb8b4f4f8e2ef673fb2d06ed8b39a88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle@arm.com>
Date: Fri, 7 Jan 2022 16:37:05 +0100
Subject: [PATCH 1/2] check-sr-results.yaml: check for Linux BSA log
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a few checks regarding the Linux BSA manual test log.

Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
---
 check-sr-results.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/check-sr-results.yaml b/check-sr-results.yaml
index 928bc1d..af4f4ad 100644
--- a/check-sr-results.yaml
+++ b/check-sr-results.yaml
@@ -174,10 +174,19 @@ tree:
       - file: capsule-update.log
         optional:
   - dir: manual-results
-    optional:
     tree:
       - dir: bsa-linux
-        optional:
+        tree:
+          - file: console.log
+            must-contain:
+              - insmod /lib/modules/bsa_acs.ko
+              - /bin/bsa
+              # The 'init BSA Driver' does not show up with ACS-IR < v1.0: do
+              # not check it for now.
+              # The 'BSA Architecture Compliance Suite' headline is sometimes
+              # garbled in the UART log due to kernel messages. We therefore
+              # explicitely do not check it.
+              - BSA tests complete
   - dir: os-logs
     tree:
       - dir: '*-*'
-- 
GitLab


From 1245814ef481b65e8091052aee467d86a61e80eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle@arm.com>
Date: Fri, 14 Jan 2022 13:32:08 +0100
Subject: [PATCH 2/2] schemas: prevent additional properties
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This helps to catch mistakes.

Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
---
 schemas/check-sr-results-schema.yaml  | 3 +++
 schemas/format-sr-results-schema.yaml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/schemas/check-sr-results-schema.yaml b/schemas/check-sr-results-schema.yaml
index b93cbd0..f517f00 100644
--- a/schemas/check-sr-results-schema.yaml
+++ b/schemas/check-sr-results-schema.yaml
@@ -46,6 +46,7 @@ definitions:
             # warn-if-contains is optional
             # can-be-empty is optional
             # optional is optional
+        additionalProperties: false
     dir:
         type: object
         properties:
@@ -59,6 +60,7 @@ definitions:
             - dir
             # tree is optional
             # optional is optional
+        additionalProperties: false
 type: object
 properties:
     check-sr-results-configuration:
@@ -68,3 +70,4 @@ properties:
 required:
     - check-sr-results-configuration
     - tree
+additionalProperties: false
diff --git a/schemas/format-sr-results-schema.yaml b/schemas/format-sr-results-schema.yaml
index 992c72d..b6f346e 100644
--- a/schemas/format-sr-results-schema.yaml
+++ b/schemas/format-sr-results-schema.yaml
@@ -43,6 +43,7 @@ definitions:
                     - find
                     # first-line is optional
                     # last-line is optional
+                additionalProperties: false
             paragraph:
                 type: string
             subs:
@@ -52,6 +53,7 @@ definitions:
             # extract is optional
             - paragraph
             # subs is optional
+        additionalProperties: false
 type: object
 properties:
     format-sr-results-configuration:
@@ -61,3 +63,4 @@ properties:
 required:
     - format-sr-results-configuration
     - subs
+additionalProperties: false
-- 
GitLab