Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Core Modules
dune-common
Commits
5690837d
Commit
5690837d
authored
2 years ago
by
Samuel Burbulla
Browse files
Options
Downloads
Patches
Plain Diff
Increase default timeout for python tests.
parent
758d2482
No related branches found
No related tags found
1 merge request
!1130
Bugfix/overhaul dune python add test
Pipeline
#52575
passed
2 years ago
Stage: test
Stage: downstream
Pipeline: Dune Nightly Test
#52576
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/modules/DunePythonTestCommand.cmake
+5
-1
5 additions, 1 deletion
cmake/modules/DunePythonTestCommand.cmake
dune/python/test/CMakeLists.txt
+0
-1
0 additions, 1 deletion
dune/python/test/CMakeLists.txt
with
5 additions
and
2 deletions
cmake/modules/DunePythonTestCommand.cmake
+
5
−
1
View file @
5690837d
...
...
@@ -40,7 +40,7 @@ function(dune_python_add_test)
# Parse Arguments
set
(
OPTION
)
set
(
SINGLE NAME
)
set
(
MULTI SCRIPT MODULE CMAKE_GUARD LABELS
)
set
(
MULTI SCRIPT MODULE CMAKE_GUARD LABELS
TIMEOUT
)
cmake_parse_arguments
(
PYTEST
""
"
${
SINGLE
}
"
"
${
MULTI
}
"
${
ARGN
}
)
if
(
PYTEST_COMMAND
)
message
(
FATAL_ERROR
"dune_python_add_test: COMMAND argument should not be used, use SCRIPT instead providing only the Python script and not the Python interpreter"
)
...
...
@@ -49,6 +49,9 @@ function(dune_python_add_test)
# Apply defaults
set
(
PYTEST_CMAKE_GUARD
${
PYTEST_CMAKE_GUARD
}
DUNE_ENABLE_PYTHONBINDINGS
)
set
(
PYTEST_LABELS
${
PYTEST_LABELS
}
python
)
if
(
NOT PYTEST_TIMEOUT
)
set
(
PYTEST_TIMEOUT 3600
)
endif
()
if
((
NOT PYTEST_MODULE
)
AND
(
NOT PYTEST_SCRIPT
))
message
(
FATAL_ERROR
"dune_python_add_test: Either SCRIPT or MODULE need to be specified!"
)
...
...
@@ -79,6 +82,7 @@ function(dune_python_add_test)
PYTHON_TEST
CMAKE_GUARD
${
PYTEST_CMAKE_GUARD
}
LABELS
${
PYTEST_LABELS
}
TIMEOUT
${
PYTEST_TIMEOUT
}
${
PYTEST_UNPARSED_ARGUMENTS
}
)
endfunction
()
This diff is collapsed.
Click to expand it.
dune/python/test/CMakeLists.txt
+
0
−
1
View file @
5690837d
...
...
@@ -2,7 +2,6 @@ dune_python_add_test(NAME pythontests
SCRIPT pythontests.py
WORKING_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
MPI_RANKS 1 2 4
TIMEOUT 300
LABELS quick
)
...
...
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