From 5d3fb0565a5d83e22173b80c38dc4f7bd8a6635e Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Tue, 18 May 2021 20:48:34 +0200 Subject: [PATCH] WIP: pipeline --- test/.docker/Dockerfile | 4 ++-- test/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/.docker/Dockerfile b/test/.docker/Dockerfile index 2866eb8..7af10e7 100644 --- a/test/.docker/Dockerfile +++ b/test/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM debian:latest RUN apt-get update && \ - apt-get install -y \ - cmake + apt-get install -y cmake +RUN apt-get install -y libcmocka0 COPY ./ caosdb-clib/ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2f9562c..1ac6166 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -8,9 +8,9 @@ if (cmocka-static) message(STATUS "Found pre-installed cmocka: ${cmocka-static}") elseif (${CMAKE_VERSION} VERSION_LESS "3.14.0") message(FATAL_ERROR - "Failed to run tests. A pre-installed cmocka could not be found and - your cmake version is prior to 3.14. Please consider to upgrade you - cmake (>=3.14) or install cmocka.") +"Failed to run tests. A pre-installed cmocka could not be found and +your cmake version is prior to 3.14. Please consider to upgrade you +cmake (>=3.14) or install cmocka.") else () include(FetchCMocka) endif () -- GitLab