Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs-feliks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Feliks Kiszkurno
ogs-feliks
Commits
8fc807cd
Unverified
Commit
8fc807cd
authored
6 months ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[cmake,ci] Fix timeout setting in OgsTest().
parent
6e85babd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/cmake/test/OgsTest.cmake
+8
-4
8 additions, 4 deletions
scripts/cmake/test/OgsTest.cmake
with
8 additions
and
4 deletions
scripts/cmake/test/OgsTest.cmake
+
8
−
4
View file @
8fc807cd
...
@@ -26,11 +26,14 @@ function(OgsTest)
...
@@ -26,11 +26,14 @@ function(OgsTest)
)
)
endif
()
endif
()
set
(
timeout
${
ogs.ctest.large_runtime
}
)
if
(
NOT DEFINED OgsTest_RUNTIME
)
if
(
DEFINED OgsTest_RUNTIME
)
math
(
EXPR timeout
"
${
OgsTest_RUNTIME
}
* 3"
)
else
()
set
(
OgsTest_RUNTIME 1
)
set
(
OgsTest_RUNTIME 1
)
elseif
(
OgsTest_RUNTIME GREATER 750
)
# Set a timeout on jobs larger than the default ctest timeout of 1500
# (s). The allowed runtime is twice as long as the given RUNTIME
# parameter.
math
(
EXPR timeout
"
${
OgsTest_RUNTIME
}
* 2"
)
set
(
timeout TIMEOUT
${
timeout
}
)
endif
()
endif
()
if
(
DEFINED OGS_CTEST_MAX_RUNTIME
)
if
(
DEFINED OGS_CTEST_MAX_RUNTIME
)
...
@@ -132,6 +135,7 @@ macro(_ogs_add_test TEST_NAME)
...
@@ -132,6 +135,7 @@ macro(_ogs_add_test TEST_NAME)
${
OgsTest_DISABLED
}
${
OgsTest_DISABLED
}
LABELS
LABELS
"
${
labels
}
"
"
${
labels
}
"
${
timeout
}
)
)
endmacro
()
endmacro
()
...
...
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