From 89e83184de04431ff7a0ac0306fe741278508db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Mon, 17 Apr 2023 23:41:44 +0200 Subject: [PATCH] Docker: Add cmake consistency check to misc tests --- tools/docker/Dockerfile.test_doxygen | 1 + tools/docker/Dockerfile.test_misc | 1 + tools/docker/generate_dockerfiles.py | 1 + tools/docker/scripts/install_misc.sh | 2 ++ tools/docker/scripts/test_misc.sh | 2 ++ 5 files changed, 7 insertions(+) diff --git a/tools/docker/Dockerfile.test_doxygen b/tools/docker/Dockerfile.test_doxygen index 34c5e0f708..42b18bdb3f 100644 --- a/tools/docker/Dockerfile.test_doxygen +++ b/tools/docker/Dockerfile.test_doxygen @@ -17,6 +17,7 @@ COPY ./exts ./exts COPY ./data ./data COPY ./tools ./tools COPY ./cmake ./cmake +COPY ./CMakeLists.txt . COPY ./Makefile . RUN bash -c "if [ -n "${GIT_COMMIT_SHA}" ] ; then echo "git:\${GIT_COMMIT_SHA::7}" > REVISION; fi" diff --git a/tools/docker/Dockerfile.test_misc b/tools/docker/Dockerfile.test_misc index d966890233..cd6046e59c 100644 --- a/tools/docker/Dockerfile.test_misc +++ b/tools/docker/Dockerfile.test_misc @@ -17,6 +17,7 @@ COPY ./exts ./exts COPY ./data ./data COPY ./tools ./tools COPY ./cmake ./cmake +COPY ./CMakeLists.txt . COPY ./Makefile . RUN bash -c "if [ -n "${GIT_COMMIT_SHA}" ] ; then echo "git:\${GIT_COMMIT_SHA::7}" > REVISION; fi" diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index 0d934146c3..bdc5311056 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -288,6 +288,7 @@ COPY ./exts ./exts COPY ./data ./data COPY ./tools ./tools COPY ./cmake ./cmake +COPY ./CMakeLists.txt . COPY ./Makefile . RUN bash -c "if [ -n "${{GIT_COMMIT_SHA}}" ] ; then echo "git:\${{GIT_COMMIT_SHA::7}}" > REVISION; fi" diff --git a/tools/docker/scripts/install_misc.sh b/tools/docker/scripts/install_misc.sh index 8f6875c338..25ad42ef2a 100755 --- a/tools/docker/scripts/install_misc.sh +++ b/tools/docker/scripts/install_misc.sh @@ -13,6 +13,8 @@ apt-get install -qq --no-install-recommends \ python3-setuptools \ python3-dev \ build-essential \ + gfortran \ + cmake \ golang \ unzip \ wget diff --git a/tools/docker/scripts/test_misc.sh b/tools/docker/scripts/test_misc.sh index 00720b5378..33ae191b4e 100755 --- a/tools/docker/scripts/test_misc.sh +++ b/tools/docker/scripts/test_misc.sh @@ -53,6 +53,8 @@ run_test mypy --strict ./tools/conventions/analyze_gfortran_ast.py # /workspace/artifacts/dashboard/ # done +run_test cmake -DCP2K_ENABLE_CONSISTENCY_CHECKS=ON . + echo "" echo "Summary: Miscellaneous tests passed" echo "Status: OK"