Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitri Naumov
ogs
Commits
03d2c78f
Commit
03d2c78f
authored
3 years ago
by
Lars Bilke
Committed by
Dmitri Naumov
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[T] Disable snakemake tests when tee tool is not available.
parent
9ba5f049
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Applications/Utils/Tests.cmake
+2
-2
2 additions, 2 deletions
Applications/Utils/Tests.cmake
scripts/cmake/Find.cmake
+4
-0
4 additions, 0 deletions
scripts/cmake/Find.cmake
with
6 additions
and
2 deletions
Applications/Utils/Tests.cmake
+
2
−
2
View file @
03d2c78f
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Find.cmake
+
4
−
0
View file @
03d2c78f
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment