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
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
Yuhao Liu
ogs
Commits
50bf4aa8
Verified
Commit
50bf4aa8
authored
4 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[T] Added DISABLED-option to AddTest() and OgsTest().
parent
5fdcd8bf
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/cmake/test/AddTest.cmake
+8
-3
8 additions, 3 deletions
scripts/cmake/test/AddTest.cmake
scripts/cmake/test/OgsTest.cmake
+4
-1
4 additions, 1 deletion
scripts/cmake/test/OgsTest.cmake
with
12 additions
and
4 deletions
scripts/cmake/test/AddTest.cmake
+
8
−
3
View file @
50bf4aa8
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +17,8 @@
# OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS)
# OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS)
# VIS <vtu output file(s)> # optional for documentation
# VIS <vtu output file(s)> # optional for documentation
# RUNTIME <in seconds> # optional for optimizing ctest duration
# RUNTIME <in seconds> # optional for optimizing ctest duration
# values should be taken from eve serial job
# values should be taken from envinf job
# DISABLED # optional, disables the test
# )
# )
#
#
# Conditional arguments:
# Conditional arguments:
...
@@ -43,7 +44,7 @@ function (AddTest)
...
@@ -43,7 +44,7 @@ function (AddTest)
set
(
LARGE_RUNTIME 60
)
set
(
LARGE_RUNTIME 60
)
# parse arguments
# parse arguments
set
(
options
NONE
)
set
(
options
DISABLED
)
set
(
oneValueArgs EXECUTABLE PATH NAME WRAPPER TESTER ABSTOL RELTOL RUNTIME DEPENDS
)
set
(
oneValueArgs EXECUTABLE PATH NAME WRAPPER TESTER ABSTOL RELTOL RUNTIME DEPENDS
)
set
(
multiValueArgs EXECUTABLE_ARGS DATA DIFF_DATA WRAPPER_ARGS REQUIREMENTS VIS
)
set
(
multiValueArgs EXECUTABLE_ARGS DATA DIFF_DATA WRAPPER_ARGS REQUIREMENTS VIS
)
cmake_parse_arguments
(
AddTest
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
cmake_parse_arguments
(
AddTest
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
...
@@ -272,6 +273,7 @@ Use six arguments version of AddTest with absolute and relative tolerances")
...
@@ -272,6 +273,7 @@ Use six arguments version of AddTest with absolute and relative tolerances")
if
(
DEFINED MPI_PROCESSORS
)
if
(
DEFINED MPI_PROCESSORS
)
set_tests_properties
(
${
TEST_NAME
}
PROPERTIES PROCESSORS
${
MPI_PROCESSORS
}
)
set_tests_properties
(
${
TEST_NAME
}
PROPERTIES PROCESSORS
${
MPI_PROCESSORS
}
)
endif
()
endif
()
set_tests_properties
(
${
TEST_NAME
}
PROPERTIES DISABLED
${
AddTest_DISABLED
}
)
if
(
TARGET
${
AddTest_EXECUTABLE
}
)
if
(
TARGET
${
AddTest_EXECUTABLE
}
)
add_dependencies
(
ctest
${
AddTest_EXECUTABLE
}
)
add_dependencies
(
ctest
${
AddTest_EXECUTABLE
}
)
...
@@ -300,6 +302,9 @@ Use six arguments version of AddTest with absolute and relative tolerances")
...
@@ -300,6 +302,9 @@ Use six arguments version of AddTest with absolute and relative tolerances")
--debug-output
--debug-output
WORKING_DIRECTORY
${
AddTest_SOURCE_PATH
}
WORKING_DIRECTORY
${
AddTest_SOURCE_PATH
}
)
)
set_tests_properties
(
${
TESTER_NAME
}
PROPERTIES DEPENDS
${
TEST_NAME
}
)
set_tests_properties
(
${
TESTER_NAME
}
PROPERTIES
DEPENDS
${
TEST_NAME
}
DISABLED
${
AddTest_DISABLED
}
)
endfunction
()
endfunction
()
This diff is collapsed.
Click to expand it.
scripts/cmake/test/OgsTest.cmake
+
4
−
1
View file @
50bf4aa8
...
@@ -5,6 +5,7 @@ function (OgsTest)
...
@@ -5,6 +5,7 @@ function (OgsTest)
if
(
NOT OGS_BUILD_CLI OR NOT BUILD_TESTING
)
if
(
NOT OGS_BUILD_CLI OR NOT BUILD_TESTING
)
return
()
return
()
endif
()
endif
()
set
(
options DISABLED
)
set
(
oneValueArgs PROJECTFILE RUNTIME
)
set
(
oneValueArgs PROJECTFILE RUNTIME
)
set
(
multiValueArgs WRAPPER
)
set
(
multiValueArgs WRAPPER
)
cmake_parse_arguments
(
OgsTest
"
${
options
}
"
"
${
oneValueArgs
}
"
cmake_parse_arguments
(
OgsTest
"
${
options
}
"
"
${
oneValueArgs
}
"
...
@@ -52,7 +53,9 @@ function (OgsTest)
...
@@ -52,7 +53,9 @@ function (OgsTest)
set_tests_properties
(
${
TEST_NAME
}
PROPERTIES
set_tests_properties
(
${
TEST_NAME
}
PROPERTIES
ENVIRONMENT VTKDIFF_EXE=$<TARGET_FILE:vtkdiff>
ENVIRONMENT VTKDIFF_EXE=$<TARGET_FILE:vtkdiff>
COST
${
OgsTest_RUNTIME
}
)
COST
${
OgsTest_RUNTIME
}
DISABLED
${
OgsTest_DISABLED
}
)
if
(
TARGET
${
OgsTest_EXECUTABLE
}
)
if
(
TARGET
${
OgsTest_EXECUTABLE
}
)
add_dependencies
(
ctest
${
OgsTest_EXECUTABLE
}
)
add_dependencies
(
ctest
${
OgsTest_EXECUTABLE
}
)
...
...
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