From a5814469ab20fe3c19fc64d96521b004e7e7229e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 4 Aug 2020 12:01:59 +0200 Subject: validation: Fix N/A scope description --- rtemsspec/tests/test_validation.py | 15 ++++++++++----- rtemsspec/validation.py | 6 ++++-- 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[] = {{") -- cgit v1.2.3