From 03d2c78f3cf834a6915d5fee28afe1199013cd11 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Thu, 29 Apr 2021 12:25:51 +0200 Subject: [PATCH] [T] Disable snakemake tests when tee tool is not available. --- Applications/Utils/Tests.cmake | 4 ++-- scripts/cmake/Find.cmake | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake index 081c503f06f..50805941810 100644 --- a/Applications/Utils/Tests.cmake +++ b/Applications/Utils/Tests.cmake @@ -300,7 +300,7 @@ AddTest( AmmerSubsurfaceGrid.vtu AmmerGridOutput.vtu MaterialIDs MaterialIDs 0 0 ) -if(SNAKEMAKE AND NOT OGS_USE_MPI) +if(SNAKEMAKE AND NOT OGS_USE_MPI AND TEE_TOOL_PATH) add_test(NAME snakemake_ExtractBoundary COMMAND ${SNAKEMAKE} -j 1 --configfile ${PROJECT_BINARY_DIR}/buildinfo.yaml @@ -485,7 +485,7 @@ if(TARGET VerticalSliceFromLayers AND GMSH) endif() -if(TARGET GMSH2OGS AND SNAKEMAKE AND NOT OGS_USE_MPI) +if(TARGET GMSH2OGS AND SNAKEMAKE AND NOT OGS_USE_MPI AND TEE_TOOL_PATH) add_test(NAME snakemake_GMSH2OGS_ExtractBoundary COMMAND ${SNAKEMAKE} --cores all --configfile ${PROJECT_BINARY_DIR}/buildinfo.yaml diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index badcfb9fdb2..c9cbd7f54ed 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -47,6 +47,10 @@ find_program(PANDOC_CITEPROC pandoc-citeproc) find_program(MODULE_CMD lmod PATHS /software/lmod/lmod/libexec) find_program(SNAKEMAKE snakemake HINTS ${LOCAL_VIRTUALENV_BIN_DIRS}) +find_program(TEE_TOOL_PATH tee) +if(OGS_BUILD_TESTING AND SNAKEMAKE AND NOT TEE_TOOL_PATH) + message(WARNING "tee tool was not found. Snakemake tests are disabled!") +endif() find_program(GMSH gmsh) -- GitLab