From 435d0d95fa2919cd72ed10c004094de8334d6629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Creuse?= Date: Mon, 29 Sep 2025 15:18:43 +0000 Subject: [PATCH] Merge branch 'topic/4205-various-fixes' into 'qualkit-4502' Various qualkit updates See merge request eng/das/cov/gnatcoverage-qualification!36 The modifications include: * TOR: Refinements over the expected execution environment * TOR: remove index entry definitions * PLANS: Remove duplicate revision history section (cherry picked from commit 772afba72ae4014b866562d04b6f3fd8c5f8d5dd) --- qualification/qualkit/_common/project_settings.yaml | 2 +- qualification/qualkit/plans/plans.rst | 8 -------- testsuite/Qualif/Ada/content.rst | 4 ---- testsuite/Qualif/Ada/decision/req_set.rst | 7 ------- testsuite/Qualif/Ada/mcdc/req_set.rst | 7 ------- testsuite/Qualif/Ada/stmt/req_set.rst | 6 ------ testsuite/Qualif/C/set.txt | 3 --- testsuite/Qualif/C/stmt/set.txt | 4 ---- testsuite/Qualif/Environment/content.rst | 6 +++--- 9 files changed, 4 insertions(+), 43 deletions(-) diff --git a/qualification/qualkit/_common/project_settings.yaml b/qualification/qualkit/_common/project_settings.yaml index 863d962df..6eb21ad3b 100644 --- a/qualification/qualkit/_common/project_settings.yaml +++ b/qualification/qualkit/_common/project_settings.yaml @@ -9,7 +9,7 @@ project: 'prj_toolset_bold': '**GNATcoverage**', 'prj_switches': '', 'prj_platform': 'TBD', - 'prj_host_platform': 'TBD', + 'prj_host_platform': 'linux', 'prj_RTS': 'No --RTS switch expected. Programs shall honor the :ref:`language-scope` restrictions, nevertheless.', 'prj_dump_trigger': ':literal:`--dump-triger=atexit`', 'prj_dump_channel': ':literal:`--dump-channel=bin-file`', diff --git a/qualification/qualkit/plans/plans.rst b/qualification/qualkit/plans/plans.rst index 7d9c1842c..7abd61331 100644 --- a/qualification/qualkit/plans/plans.rst +++ b/qualification/qualkit/plans/plans.rst @@ -2,14 +2,6 @@ GNATcoverage - |tool_standard| Qualification Material: |doc_title| =================================================================== -.. rubric:: Revision History - -.. csv-table:: - :delim: & - :header: "Version #", "Date", "Comment" - - |release| & |today| & Initial version - .. toctree:: :maxdepth: 1 diff --git a/testsuite/Qualif/Ada/content.rst b/testsuite/Qualif/Ada/content.rst index 1349c709f..e976c9dfb 100644 --- a/testsuite/Qualif/Ada/content.rst +++ b/testsuite/Qualif/Ada/content.rst @@ -1,9 +1,6 @@ Source coverage TORs for Ada ============================ -.. index:: - single: Ada; Toplevel Requirement Group - This is split in several parts, one per coverage criterion of relevance: @@ -13,4 +10,3 @@ relevance: stmt decision mcdc - diff --git a/testsuite/Qualif/Ada/decision/req_set.rst b/testsuite/Qualif/Ada/decision/req_set.rst index b4f1911de..261b591fd 100644 --- a/testsuite/Qualif/Ada/decision/req_set.rst +++ b/testsuite/Qualif/Ada/decision/req_set.rst @@ -3,16 +3,9 @@ Decision Coverage (DC) assessments Decision Coverage (DC) TORs and Testcases for Ada -.. index:: - pair: Ada; DECISION Coverage - single: Requirements; Ada DECISION Coverage - This is split in several parts: .. qmlink:: SubsetIndexImporter * - - - diff --git a/testsuite/Qualif/Ada/mcdc/req_set.rst b/testsuite/Qualif/Ada/mcdc/req_set.rst index 6fcdb3956..ba8061bc9 100644 --- a/testsuite/Qualif/Ada/mcdc/req_set.rst +++ b/testsuite/Qualif/Ada/mcdc/req_set.rst @@ -3,16 +3,9 @@ Modified Condition/Decision Coverage (MCDC) assessments Modified Condition/Decision Coverage (MCDC) TORs and Testcases for Ada -.. index:: - pair: Ada; MCDC Coverage - single: Requirements; Ada MCDC Coverage - This is split in several parts: .. qmlink:: SubsetIndexImporter * - - - diff --git a/testsuite/Qualif/Ada/stmt/req_set.rst b/testsuite/Qualif/Ada/stmt/req_set.rst index 120706df6..42a8550f6 100644 --- a/testsuite/Qualif/Ada/stmt/req_set.rst +++ b/testsuite/Qualif/Ada/stmt/req_set.rst @@ -1,15 +1,9 @@ Statement Coverage (SC) assessments =================================== -.. index:: - pair: Ada; STATEMENT Coverage - single: Requirements; Ada STATEMENT Coverage - This is split in several parts: .. qmlink:: SubsetIndexImporter * - - diff --git a/testsuite/Qualif/C/set.txt b/testsuite/Qualif/C/set.txt index 492cb5a14..0bf164092 100644 --- a/testsuite/Qualif/C/set.txt +++ b/testsuite/Qualif/C/set.txt @@ -3,9 +3,6 @@ Source coverage TORs and Testcases for C Source coverage TORs and Testcases for C -.. index:: - single: C; Toplevel Requirement Group - This is split in several parts, one per target coverage criterion of relevance: %(subset-index)s diff --git a/testsuite/Qualif/C/stmt/set.txt b/testsuite/Qualif/C/stmt/set.txt index 300afbb0b..24d87c607 100644 --- a/testsuite/Qualif/C/stmt/set.txt +++ b/testsuite/Qualif/C/stmt/set.txt @@ -3,10 +3,6 @@ Statement Coverage (SC) TORs and Testcases for C Statement Coverage (SC) TORs and Testcases for C -.. index:: - pair: C; STATEMENT Coverage - single: Requirements; C STATEMENT Coverage - This is split in several parts: %(subset-index)s diff --git a/testsuite/Qualif/Environment/content.rst b/testsuite/Qualif/Environment/content.rst index d011b2e93..893f6aa6d 100644 --- a/testsuite/Qualif/Environment/content.rst +++ b/testsuite/Qualif/Environment/content.rst @@ -27,9 +27,9 @@ matching process. :widths: 5, 30, 60 :delim: / - e1 / Host Operating System name and version / |prj_host_platform| - e2 / GNATcoverage executable name and version / |gnatcov_version| - e3 / GNAT Pro compiler executable name and version / |gnatpro_version| + e1 / Host Operating System family / |prj_host_platform| + e2 / GNATcoverage version / |gnatcov_version| + e3 / GNAT Pro platform version / |gnatpro_version| s1 / GNAT Pro compilation switches / |prj_switches| s2 / GNAT Pro Runtime Library Profile / |prj_RTS| s3 / GNATcov dump trigger switch value / |prj_dump_trigger|