From 01cf45347c9e6a27bd99daac7566635ce19c3aa0 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 18 May 2021 21:52:17 +0200
Subject: [PATCH] WIP: pipeline
---
test/.docker/Dockerfile | 8 +++++++-
test/CMakeLists.txt | 8 +++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/test/.docker/Dockerfile b/test/.docker/Dockerfile
index ab98426..64e4d45 100644
--- a/test/.docker/Dockerfile
+++ b/test/.docker/Dockerfile
@@ -2,5 +2,11 @@ FROM debian:latest
RUN apt-get update && \
apt-get install -y cmake
RUN apt-get install -y libcmocka-dev
+#RUN apt-get install -y lcov
+#RUN apt-get install -y doxygen
+#RUN apt-get install -y python3-pip
-COPY ./ caosdb-clib/
+
+
+
+#COPY ./ caosdb-clib/
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fe31079..a6fd8b2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,16 +3,18 @@ set(test_cases
test_connection
)
+# look for pre-installed cmocka headers
find_library(cmocka cmocka)
if (cmocka)
message(STATUS "Found pre-installed cmocka: ${cmocka-static}")
set(cmocka-link "cmocka")
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. Pre-installed cmocka headers could not be found
+and your cmake version is prior to 3.14. Please consider to upgrade your
+cmake (>=3.14) or install cmocka headers.")
else ()
+ # cmake >= 3.14
include(FetchCMocka)
set(cmocka-link "cmocka-static")
endif ()
--
GitLab