Bumbling around trying to fix assert in CI

Not able to reproduce so far.

Author: Scott Dixon

cetlvast/CMakePresets.json

@@ -502,20 +502,6 @@
                 "gcovr_sonarqube_report_for_examples"
             ]
         },
-        {
-            "name": "manual-Coverage-no-scan-gcc-native-cpp-14-offline",
-            "configurePreset": "configure-gcc-native-cpp-14-offline",
-            "configuration": "Coverage",
-            "targets": [
-                "build",
-                "run_unittests",
-                "gcovr_html_report_for_unittest",
-                "gcovr_sonarqube_report_for_unittest",
-                "run_examples",
-                "gcovr_html_report_for_examples",
-                "gcovr_sonarqube_report_for_examples"
-            ]
-        },
         {
             "name": "build-Release-gcc-native-cpp-14-online",
             "configurePreset": "configure-gcc-native-cpp-14-online",
@@ -2112,21 +2098,6 @@
                 }
             ]
         },
-        {
-            "name": "manual-sonar-scan-gcc-native-cpp-14-offline",
-            "displayName": "gcc native cpp 14 offline (Coverage only).",
-            "description": "Hand-managed workflow for generating coverage data for sonarqube scans.",
-            "steps": [
-                {
-                    "type": "configure",
-                    "name": "configure-gcc-native-cpp-14-offline"
-                },
-                {
-                    "type": "build",
-                    "name": "manual-Coverage-gcc-native-cpp-14-offline"
-                }
-            ]
-        },
         {
             "name": "manual-coverage-gcc-native-cpp-14-offline",
             "displayName": "gcc native cpp 14 offline (Coverage only).",
@@ -2138,7 +2109,7 @@
                 },
                 {
                     "type": "build",
-                    "name": "manual-Coverage-no-scan-gcc-native-cpp-14-offline"
+                    "name": "manual-Coverage-gcc-native-cpp-14-offline"
                 }
             ]
         },

cetlvast/suites/docs/examples/CMakeLists.txt

@@ -31,7 +31,7 @@ set(NATIVE_EXAMPLES
     example_08_variable_length_array_vs_vector.cpp
     example_09_variant.cpp
     example_10_unbounded_variant.cpp
-    example_11_memory_resource_01heap.cpp
+    example_11_memory_resource_o1heap.cpp
 )
 
 set(ALL_EXAMPLES "")

…es/example_11_memory_resource_01heap.cpp …es/example_11_memory_resource_o1heap.cppcetlvast/suites/docs/examples/example_11_memory_resource_01heap.cpp renamed to cetlvast/suites/docs/examples/example_11_memory_resource_o1heap.cpp cetlvast/suites/docs/examples/example_11_memory_resource_01heap.cpp renamed to cetlvast/suites/docs/examples/example_11_memory_resource_o1heap.cpp

@@ -16,7 +16,7 @@ namespace cetl
 namespace pf17
 {
 
-TEST(example_11_memory_resource_01heap, main)
+TEST(example_11_memory_resource_o1heap, main)
 {
     //! [main]
     // We'll use the aligned-storage helper class to defined properly aligned storage for the 01-heap areana. As this

cetlvast/suites/unittest/CMakeLists.txt

@@ -208,5 +208,3 @@ add_executable(cetlvast_sonar
 target_link_libraries(cetlvast_sonar
     PRIVATE cetl
 )
-
-find_package(SonarScanner)

cetlvast/suites/unittest/test_o1heap_memory_resource.cpp

@@ -22,24 +22,15 @@ namespace test
 
 class O1HeapMemoryResourceTest : public ::testing::Test
 {
-    static constexpr std::size_t TestBufferSize = 0x100000;
+    static constexpr std::size_t TestBufferSize = 0x4096;
 
 public:
     cetl::pmr::O1HeapAlignedStorage<TestBufferSize> large_buffer{};
 };
 
-TEST_F(O1HeapMemoryResourceTest, TestDefault)
-{
-    cetl::pmr::UnsynchronizedO1HeapMemoryResourceDelegate test_subject{large_buffer};
-    void*                                                 mem = test_subject.allocate(8);
-    ASSERT_NE(nullptr, mem);
-    test_subject.deallocate(mem, 8);
-}
-
 TEST_F(O1HeapMemoryResourceTest, O1HeapAlignedStorageTest)
 {
-    cetl::pmr::O1HeapAlignedStorage<4096>                 aligned_storage{};
-    cetl::pmr::UnsynchronizedO1HeapMemoryResourceDelegate test_subject{aligned_storage};
+    cetl::pmr::UnsynchronizedO1HeapMemoryResourceDelegate test_subject{large_buffer};
     void*                                                 mem = test_subject.allocate(16);
     ASSERT_NE(nullptr, mem);
     test_subject.deallocate(mem, 16);
@@ -89,12 +80,7 @@ TEST_F(O1HeapMemoryResourceTest, TestAllocationFailureThrowsBadAlloc)
     void* final_alloc = test_subject.allocate(64);
     EXPECT_EQ(nullptr, final_alloc) << "Allocation should return nullptr when heap is exhausted";
 #endif
-
-    // Clean up allocations
-    for (void* mem : allocations)
-    {
-        test_subject.deallocate(mem, 64);
-    }
+    // Don't worry about deallocating memory since the allocator and small_buffer both go out of scope with the test.
 }
 
 }  // namespace test

include/cetl/cetl.hpp

@@ -31,7 +31,7 @@
 /// - @subpage example_08_variable_length_array_vs_vector
 /// - @subpage example_09_variant
 /// - @subpage example_10_unbounded_variant
-/// - @subpage example_11_memory_resource_01heap
+/// - @subpage example_11_memory_resource_o1heap
 ///
 /// @page example_01_polyfill_20 Example 1: CETL C++20 Polyfill Header
 /// Full example for @ref cetl/pf20/cetlpf.hpp
@@ -74,9 +74,9 @@
 /// Full example for cetl::unbounded_variant
 /// @include example_10_unbounded_variant.cpp
 ///
-/// @page example_11_memory_resource_01heap Example 11: Using the 01Heap memory_resource
+/// @page example_11_memory_resource_o1heap Example 11: Using the 01heap memory_resource
 /// Full example for cetl::pmr::UnsynchronizedO1HeapMemoryResourceDelegate
-/// @include example_11_memory_resource_01heap.cpp
+/// @include example_11_memory_resource_o1heap.cpp
 ///
 
 #ifndef CETL_H_INCLUDED

include/cetl/pmr/o1heap_memory_resource_delegate.hpp

@@ -4,7 +4,7 @@
 /// include cetl/pf17/cetlpf.hpp or provide the memory_resource definition you want this class to use.
 /// You'll also need to provide an include path to o1heap.h and compile in o1heap.c when using this type.
 ///
-/// @snippet{trimleft} example_11_memory_resource_01heap.cpp main
+/// @snippet{trimleft} example_11_memory_resource_o1heap.cpp main
 ///
 /// @copyright
 /// Copyright (C) OpenCyphal Development Team  <opencyphal.org>
@@ -38,10 +38,10 @@ struct O1HeapAlignedStorage
 
     static_assert(O1HEAP_ALIGNMENT >= alignof(std::max_align_t), "O1HEAP_ALIGNMENT is too small for this platform.");
 
-    struct alignas(alignment) type
+    struct alignas(alignment) type  // NOSONAR cpp:5945
     {
         std::array<unsigned char, arena_size> data;
-    } storage[1];
+    } storage[1];  // NOSONAR cpp:3646
 };
 
 class UnsynchronizedO1HeapMemoryResourceDelegate

sonar-project.properties

@@ -24,5 +24,5 @@ sonar.cpd.exclusions=cetlvast/**/*,**/sonar.cpp
 
 # Rule exclusions
 sonar.issue.ignore.multicriteria=e1
-sonar.issue.ignore.multicriteria.e1.ruleKey=cpp:S994
+sonar.issue.ignore.multicriteria.e1.ruleKey=cpp:S994,cpp:S799
 sonar.issue.ignore.multicriteria.e1.resourceKey=**/*