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
dc1a373a
Commit
dc1a373a
authored
5 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[T] Fix mpirun in tests on frontend1.
parent
c48bc084
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
Tests/CMakeLists.txt
+5
-2
5 additions, 2 deletions
Tests/CMakeLists.txt
scripts/cmake/test/AddTest.cmake
+3
-0
3 additions, 0 deletions
scripts/cmake/test/AddTest.cmake
with
8 additions
and
2 deletions
Tests/CMakeLists.txt
+
5
−
2
View file @
dc1a373a
...
...
@@ -98,13 +98,16 @@ add_custom_target(tests-cleanup ${CMAKE_COMMAND} -E remove -f testrunner.xml)
set_target_properties
(
tests-cleanup PROPERTIES FOLDER Testing
)
if
(
OGS_USE_PETSC
)
if
(
"
${
HOSTNAME
}
"
STREQUAL
"frontend1"
)
set
(
MPIRUN_ARGS --mca btl_openib_allow_ib 1
)
endif
()
set
(
TEST_FILTER_MPI --gtest_filter=-MPITest*
)
add_custom_target
(
tests
mpirun -np 1 $<TARGET_FILE:testrunner>
${
TESTRUNNER_ADDITIONAL_ARGUMENTS
}
${
TEST_FILTER_MPI
}
mpirun
${
MPIRUN_ARGS
}
-np 1 $<TARGET_FILE:testrunner>
${
TESTRUNNER_ADDITIONAL_ARGUMENTS
}
${
TEST_FILTER_MPI
}
DEPENDS testrunner tests-cleanup
)
add_custom_target
(
tests_mpi
mpirun -np 3 $<TARGET_FILE:testrunner> --gtest_filter=MPITest*
mpirun
${
MPIRUN_ARGS
}
-np 3 $<TARGET_FILE:testrunner> --gtest_filter=MPITest*
DEPENDS testrunner
)
set_target_properties
(
tests_mpi PROPERTIES FOLDER Testing
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/test/AddTest.cmake
+
3
−
0
View file @
dc1a373a
...
...
@@ -104,6 +104,9 @@ function (AddTest)
endif
()
elseif
(
AddTest_WRAPPER STREQUAL
"mpirun"
)
if
(
MPIRUN_TOOL_PATH
)
if
(
"
${
HOSTNAME
}
"
STREQUAL
"frontend1"
)
set
(
AddTest_WRAPPER_ARGS
${
AddTest_WRAPPER_ARGS
}
--mca btl_openib_allow_ib 1
)
endif
()
set
(
WRAPPER_COMMAND
${
MPIRUN_TOOL_PATH
}
)
else
()
message
(
STATUS
"ERROR: mpirun was not found but is required for
${
AddTest_NAME
}
!"
)
...
...
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