Skip to content

Commit

Permalink
Fix unittest path (#5948)
Browse files Browse the repository at this point in the history
Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
  • Loading branch information
kimkulling and kullingk authored Jan 6, 2025
1 parent 2f40a77 commit d386309
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
19 changes: 7 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 1 addition & 1 deletion test/unit/utMetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down

0 comments on commit d386309

Please sign in to comment.