updates for ubuntu 22.04 and cpputest 4.0

Author: mattheweshleman

test_support/CMakeLists.txt

@@ -1 +1,2 @@
+include_directories(include)
 add_subdirectory(cpputest-qpc-port)

test_support/common/cpputestCMake.txt

@@ -9,6 +9,14 @@ else()
     message(STATUS "Found CppUTest version ${CPPUTEST_VERSION}")
 endif()
 
+if(CPPUTEST_VERSION_MAJOR LESS 4)
+    # likely 3.8
+    add_compile_definitions(CMS_CPPUTEST_LEGACY)
+else()
+    # 4.0 version or newer
+    add_compile_definitions(CMS_CPPUTEST_V4)
+endif()
+
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARIES})
 

test_support/cpputest-qpc-port/include/cmsDummyActiveObject.hpp

@@ -29,6 +29,7 @@
 #include "qpc.h"
 #include <array>
 #include <functional>
+#include <cstdlib>
 
 namespace cms {
 

test_support/cpputest-qpc-port/src/cms_cpputest_q_onAssert.cpp

@@ -26,7 +26,7 @@
 ///***************************************************************************
 /// @endcond
 
-#include "CppUTest/TestHarness.h"
+#include "cms_cpputest.hpp"
 #include "qp_port.h" //required for Q_NORETURN definition, needed by qsafe.h
 #include "qsafe.h"
 #include "qassertMockSupport.hpp"
@@ -51,5 +51,5 @@ void Q_onError(char const* const module, int_t const id)
       .withParameter("module", module)
       .withParameter("id", id);
 
-    TEST_EXIT
+      CMS_TEST_EXIT;
 }

test_support/cpputest-qpc-port/test/cms_cpputest_qf_ctrlTests.cpp

@@ -27,7 +27,7 @@
 #include <chrono>
 #include "cms_cpputest_qf_ctrl.hpp"
 #include "cmsDummyActiveObject.hpp"
-#include "CppUTest/TestHarness.h"
+#include "cms_cpputest.hpp"
 #include "qp_pkg.h"
 
 using namespace cms::test;
@@ -128,7 +128,7 @@ TEST(qf_ctrlTests,
             sigTwoCount++;
         }
         else {
-            TEST_EXIT
+            CMS_TEST_EXIT;
         }
     });
 

test_support/include/cms_cpputest.hpp

@@ -0,0 +1,17 @@
+//
+// Created by eshlemanm on 5/18/24, providing a minor porting layer
+// to handle CppUTest 3.8 versus 4.0 changes.
+//
+
+#ifndef CPPUTEST_FOR_QPC_CMS_CPPUTEST_HPP
+#define CPPUTEST_FOR_QPC_CMS_CPPUTEST_HPP
+
+#include "CppUTest/TestHarness.h"
+
+#ifdef CMS_CPPUTEST_LEGACY
+    #define CMS_TEST_EXIT  do { TEST_EXIT } while(0)
+#else
+  #define CMS_TEST_EXIT  do { TEST_EXIT; } while(0)
+#endif    
+
+#endif   // CPPUTEST_FOR_QPC_CMS_CPPUTEST_HPP

utilities/include/cmsVectorBackedQEQueue.hpp

@@ -27,6 +27,7 @@
 #include "qpc.h"
 #include <cstdint>
 #include <vector>
+#include <cstdlib>
 
 namespace cms {