2
0
Эх сурвалжийг харах

Fix unittest path (#5948)

Co-authored-by: Kim Kulling <[email protected]>
Kim Kulling 6 сар өмнө
parent
commit
d386309af9
2 өөрчлөгдсөн 8 нэмэгдсэн , 13 устгасан
  1. 7 12
      Dockerfile
  2. 1 1
      test/unit/utMetadata.cpp

+ 7 - 12
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"]

+ 1 - 1
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 );
     }