Install cmake and gtest from standard packages (#69)

Signed-off-by: romanodanilo <[email protected]> Signed-off-by: romanodanilo <[email protected]>
asam-ev · Jun 6, 2024 · a48f3c1 · a48f3c1
1 parent e86cd04
commit a48f3c1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 33 deletions.
diff --git a/docker/Dockerfile.linux b/docker/Dockerfile.linux
@@ -7,8 +7,21 @@ FROM ubuntu:22.04 AS framework_builder
 
 SHELL ["/bin/bash", "-c"]
 
-RUN apt update && apt install -y g++ g++-10 git wget make build-essential && \
-    mkdir -p /app && mkdir -p /app/framework
+RUN echo "Installing Dependencies..." && \
+    apt update && apt install -y \ 
+    g++ \
+    g++-10 \
+    make \
+    build-essential \
+    cmake \
+    libgtest-dev \
+    qtbase5-dev \
+    libqt5xmlpatterns5-dev \
+    libxerces-c-dev \
+    pkg-config && \
+    echo "Dependencies installed." 
+
+RUN mkdir -p /app/framework
 
 COPY examples /app/framework/examples
 COPY include /app/framework/include
@@ -19,31 +32,7 @@ COPY doc /app/framework/doc
 COPY CMakeLists.txt /app/framework/CMakeLists.txt
 COPY version /app/framework/version
 COPY licenses /app/framework/licenses
-
-RUN mkdir dependencies && \
-    echo "Updating CMAKE..." && \
-    wget https://github.com/Kitware/CMake/releases/download/v3.29.3/cmake-3.29.3-linux-x86_64.sh && \
-    apt remove cmake && \
-    apt purge --auto-remove cmake && \
-    bash cmake-3.29.3-linux-x86_64.sh --skip-license --exclude-subdir --prefix=/usr/local && \
-    echo "Installing Qt..." && \
-    apt update && apt install -y \ 
-    qtbase5-dev \
-    libqt5xmlpatterns5-dev \
-    libxerces-c-dev \
-    pkg-config && \
-    echo "Dependencies installed." 
-
-RUN echo "Installing gtest..." && \
-    git clone https://github.com/google/googletest.git -b release-1.10.0 && \
-    cd googletest && \
-    mkdir build && \
-    cd build && \
-    CXX=g++-10 cmake .. && \
-    make && \
-    make install && \
-    echo "Gtest installed."
-
+COPY runtime /app/framework/runtime
 
 RUN echo "Building framework..." && \
     cd /app/framework && \
@@ -56,7 +45,6 @@ RUN echo "Building framework..." && \
     cmake --install ./build && \
     echo "Done."
 
-COPY runtime /app/framework/runtime
 
 # Runtime stage
 FROM python:3.11.9-slim-bookworm  as runtime_test

diff --git a/test/function/_common/helper.h b/test/function/_common/helper.h
@@ -9,13 +9,11 @@
 #define _HELPER_HEADER_
 
 #include <string.h>
-
 #include "qc4openx_filesystem.h"
 #include "gtest/gtest.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>
-
 #include <string>
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/framework/XMLGrammarPoolImpl.hpp>
@@ -28,16 +26,20 @@
 #include <xercesc/util/XMLException.hpp>
 #include <xercesc/util/XMLString.hpp>
 #include <xercesc/validators/schema/SchemaValidator.hpp>
+
+// Define ANSI color codes
+#define COLOR_GREEN "\033[32m"
+#define COLOR_YELLOW "\033[33m"
+#define COLOR_RESET "\033[0m"
+
 /**
  * This macro prints a formatted message during test execution.
  *
  * @param [in] _message      Message string
  */
 #define GTEST_PRINTF(_message)                                                                                         \
     {                                                                                                                  \
-        testing::internal::ColoredPrintf(testing::internal::COLOR_GREEN, "[          ] ");                             \
-        testing::internal::ColoredPrintf(testing::internal::COLOR_YELLOW, "%s", _message);                             \
-        testing::internal::ColoredPrintf(testing::internal::COLOR_YELLOW, "\n");                                       \
+        std::cout << COLOR_GREEN << "[          ] " << COLOR_YELLOW << _message << COLOR_YELLOW << "\n" << COLOR_RESET; \
     }
 
 /**