From 1e5eb0fb9f0ee2e0e1b5e44c150027ecc0d2293e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 4 Feb 2021 10:07:43 +0100 Subject: validation: Remove prologue/epilogue in test cases --- rtemsspec/tests/spec-validation/tc.yml | 4 ---- rtemsspec/tests/spec-validation/tc2.yml | 2 -- rtemsspec/tests/spec-validation/tc3.yml | 2 -- rtemsspec/tests/spec-validation/tc4.yml | 3 --- rtemsspec/tests/spec-validation/tc5.yml | 3 --- rtemsspec/tests/spec-validation/tc6.yml | 2 -- rtemsspec/tests/test_validation.py | 7 ------- rtemsspec/validation.py | 2 -- 8 files changed, 25 deletions(-) (limited to 'rtemsspec') diff --git a/rtemsspec/tests/spec-validation/tc.yml b/rtemsspec/tests/spec-validation/tc.yml index 6b5b8218..782ea763 100644 --- a/rtemsspec/tests/spec-validation/tc.yml +++ b/rtemsspec/tests/spec-validation/tc.yml @@ -40,15 +40,11 @@ test-brief: Test case brief description. test-context: [] test-context-support: null test-description: Test case description. -test-epilogue: | - /* Test case epilogue code */ test-header: null test-includes: - a.h test-local-includes: - x.h -test-prologue: | - /* Test case prologue code */ test-setup: null test-stop: null test-support: | diff --git a/rtemsspec/tests/spec-validation/tc2.yml b/rtemsspec/tests/spec-validation/tc2.yml index 89f23763..fc389198 100644 --- a/rtemsspec/tests/spec-validation/tc2.yml +++ b/rtemsspec/tests/spec-validation/tc2.yml @@ -36,13 +36,11 @@ test-context: int member test-context-support: null test-description: Test case 2 description. -test-epilogue: null test-header: null test-includes: - b.h test-local-includes: - y.h -test-prologue: null test-setup: brief: | Setup brief. diff --git a/rtemsspec/tests/spec-validation/tc3.yml b/rtemsspec/tests/spec-validation/tc3.yml index e91b0673..f8293a61 100644 --- a/rtemsspec/tests/spec-validation/tc3.yml +++ b/rtemsspec/tests/spec-validation/tc3.yml @@ -19,13 +19,11 @@ test-brief: Test case 3 brief description. test-context: [] test-context-support: null test-description: Test case 3 description. -test-epilogue: null test-header: null test-includes: - c.h test-local-includes: - z.h -test-prologue: null test-setup: null test-stop: null test-support: null diff --git a/rtemsspec/tests/spec-validation/tc4.yml b/rtemsspec/tests/spec-validation/tc4.yml index 28ddd64f..c9f3c98f 100644 --- a/rtemsspec/tests/spec-validation/tc4.yml +++ b/rtemsspec/tests/spec-validation/tc4.yml @@ -8,12 +8,9 @@ test-brief: Test case 4 brief description. test-context: [] test-context-support: null test-description: Test case 4 description. -test-epilogue: | - /* Test case 4 epilogue code */ test-header: null test-includes: [] test-local-includes: [] -test-prologue: null test-setup: null test-stop: null test-support: null diff --git a/rtemsspec/tests/spec-validation/tc5.yml b/rtemsspec/tests/spec-validation/tc5.yml index cdb98d97..00866c9c 100644 --- a/rtemsspec/tests/spec-validation/tc5.yml +++ b/rtemsspec/tests/spec-validation/tc5.yml @@ -40,8 +40,6 @@ test-brief: Test case 5 brief description. test-context: [] test-context-support: null test-description: Test case 5 description. -test-epilogue: | - /* Test case 5 epilogue code */ test-header: code: | /* Header code for ${.:/test-run}() */ @@ -68,7 +66,6 @@ test-header: target: tc5.h test-includes: [] test-local-includes: [] -test-prologue: null test-setup: null test-stop: null test-support: null diff --git a/rtemsspec/tests/spec-validation/tc6.yml b/rtemsspec/tests/spec-validation/tc6.yml index 19a03397..bf1c60dd 100644 --- a/rtemsspec/tests/spec-validation/tc6.yml +++ b/rtemsspec/tests/spec-validation/tc6.yml @@ -8,7 +8,6 @@ test-brief: null test-context: [] test-context-support: null test-description: null -test-epilogue: null test-header: code: null includes: [] @@ -17,7 +16,6 @@ test-header: target: tc6.h test-includes: [] test-local-includes: [] -test-prologue: null test-setup: null test-stop: null test-support: null diff --git a/rtemsspec/tests/test_validation.py b/rtemsspec/tests/test_validation.py index 78bbcf7e..93242cb5 100644 --- a/rtemsspec/tests/test_validation.py +++ b/rtemsspec/tests/test_validation.py @@ -863,8 +863,6 @@ T_TEST_CASE_FIXTURE( Directive, &Directive_Fixture ) */ T_TEST_CASE( Tc ) { - /* Test case prologue code */ - T_plan( 125 ); /* Test case action 0 code */ @@ -874,8 +872,6 @@ T_TEST_CASE( Tc ) /* Test case action 1 code */ /* Test case action 1 check 0 code; step 124 */ /* Test case action 1 check 1 code */ - - /* Test case epilogue code */ } /** @} */ @@ -1266,7 +1262,6 @@ T_TEST_CASE( Tc3 ) */ T_TEST_CASE( Tc4 ) { - /* Test case 4 epilogue code */ } /** @} */ @@ -1308,8 +1303,6 @@ static void Tc5_Wrap( int *a, int b, int *c ) /* Test case action 1 code */ /* Test case action 1 check 0 code; step 1 */ /* Test case action 1 check 1 code */ - - /* Test case 5 epilogue code */ } static T_fixture_node Tc5_Node; diff --git a/rtemsspec/validation.py b/rtemsspec/validation.py index 648e7879..33724c26 100644 --- a/rtemsspec/validation.py +++ b/rtemsspec/validation.py @@ -386,11 +386,9 @@ class _TestItem: pass content.gap = False with content.function(ret, name, params, align=align): - content.add(self.substitute_code(self["test-prologue"])) if self._mapper.steps > 0: content.add(f"T_plan( {self._mapper.steps} );") content.add(actions) - content.add(self.substitute_code(self["test-epilogue"])) if header and fixture: run = f"{self.ident}_Run" content.add(f"static T_fixture_node {self.ident}_Node;") -- cgit v1.2.3