summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2020-08-04 12:01:59 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2020-08-07 11:12:24 +0200
commita5814469ab20fe3c19fc64d96521b004e7e7229e (patch)
tree3fd137928a9208ebfeb675a24ec45bd84785f35f
parentvalidation: Clarify skip action transitions (diff)
downloadrtems-central-a5814469ab20fe3c19fc64d96521b004e7e7229e.tar.bz2
validation: Fix N/A scope description
-rw-r--r--rtemsspec/tests/test_validation.py15
-rw-r--r--rtemsspec/validation.py6
2 files changed, 14 insertions, 7 deletions
diff --git a/rtemsspec/tests/test_validation.py b/rtemsspec/tests/test_validation.py
index 32402fe4..7c7c2425 100644
--- a/rtemsspec/tests/test_validation.py
+++ b/rtemsspec/tests/test_validation.py
@@ -246,7 +246,8 @@ static ClassicTaskIdentification_Context
static const char * const ClassicTaskIdentification_PreDesc_Name[] = {
"Invalid",
"Self",
- "Valid"
+ "Valid",
+ "NA"
};
static const char * const ClassicTaskIdentification_PreDesc_Node[] = {
@@ -255,12 +256,14 @@ static const char * const ClassicTaskIdentification_PreDesc_Node[] = {
"Invalid",
"SearchAll",
"SearchOther",
- "SearchLocal"
+ "SearchLocal",
+ "NA"
};
static const char * const ClassicTaskIdentification_PreDesc_Id[] = {
"NullPtr",
- "Valid"
+ "Valid",
+ "NA"
};
static const char * const * const ClassicTaskIdentification_PreDesc[] = {
@@ -1195,13 +1198,15 @@ static Action2_Context
static const char * const Action2_PreDesc_A[] = {
"X",
- "Y"
+ "Y",
+ "NA"
};
static const char * const Action2_PreDesc_B[] = {
"X",
"Y",
- "Z"
+ "Z",
+ "NA"
};
static const char * const * const Action2_PreDesc[] = {
diff --git a/rtemsspec/validation.py b/rtemsspec/validation.py
index d617cf75..cf3053ae 100644
--- a/rtemsspec/validation.py
+++ b/rtemsspec/validation.py
@@ -286,8 +286,10 @@ class _TestDirectiveItem(_TestItem):
content.add("static const char * const "
f"{self.ident}_PreDesc_{condition['name']}[] = {{")
with content.indent():
- content.add(",\n".join(f"\"{state['name']}\""
- for state in condition["states"]))
+ content.add(",\n".join(
+ itertools.chain((f"\"{state['name']}\""
+ for state in condition["states"]),
+ ["\"NA\""])))
content.add("};")
content.add("static const char * const * const "
f"{self.ident}_PreDesc[] = {{")