From d386309af954ec9d665e57677a63ffa580fb613e Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 6 Jan 2025 23:03:59 +0100 Subject: [PATCH] Fix unittest path (#5948) Co-authored-by: Kim Kulling --- Dockerfile | 19 +++++++------------ test/unit/utMetadata.cpp | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 716e8b5d8b..5c43a03631 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,17 @@ -FROM ubuntu:22.04 +FROM gcc:latest -RUN apt-get update && apt-get install --no-install-recommends -y ninja-build \ - git cmake build-essential software-properties-common +RUN apt-get update && apt-get install --no-install-recommends -y ninja-build cmake -RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update - -WORKDIR /opt +WORKDIR /app RUN apt install zlib1g-dev -# Build Assimp -RUN git clone https://github.com/assimp/assimp.git /opt/assimp - -WORKDIR /opt/assimp +COPY . . -RUN git checkout master \ - && mkdir build && cd build && \ +RUN mkdir build && cd build && \ cmake -G 'Ninja' \ -DCMAKE_BUILD_TYPE=Release \ -DASSIMP_BUILD_ASSIMP_TOOLS=ON \ .. && \ ninja -j4 && ninja install + +CMD ["/app/build/bin/unit"] diff --git a/test/unit/utMetadata.cpp b/test/unit/utMetadata.cpp index 76afd52efb..f161fc6388 100644 --- a/test/unit/utMetadata.cpp +++ b/test/unit/utMetadata.cpp @@ -229,7 +229,7 @@ TEST_F( utMetadata, copy_test ) { // bool test { - bool v; + bool v = true; EXPECT_TRUE( copy.Get( "bool", v ) ); EXPECT_EQ( bv, v ); }