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
efffb029
Commit
efffb029
authored
3 weeks ago
by
Simon Praetorius
Browse files
Options
Downloads
Patches
Plain Diff
Remove the NO_ADD_ALL_FLAGS argument to dune_add_test
parent
3eaacb22
No related branches found
Branches containing commit
No related tags found
1 merge request
!1207
Remove add_dune_all_flags from dune_add_test
Pipeline
#77259
passed
3 weeks ago
Stage: .pre
Stage: test
Stage: code_quality
Stage: downstream
Pipeline: Dune Nightly Test
#77268
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-3
1 addition, 3 deletions
CHANGELOG.md
cmake/modules/DuneTestMacros.cmake
+2
-8
2 additions, 8 deletions
cmake/modules/DuneTestMacros.cmake
with
3 additions
and
11 deletions
CHANGELOG.md
+
1
−
3
View file @
efffb029
...
...
@@ -24,9 +24,7 @@ SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
allows to run these tests with
`ctest -L <module>`
.
-
Change the behavior of
`dune_add_test`
: Do not add all package flags automatically. This new behavior
can be controlled by the new Dune policy
`DP_TEST_ADD_ALL_FLAGS`
. The
`dune_add_test`
macro is also
extended by the new option
`NO_ADD_ALL_FLAGS`
to deactivate the
`add_dune_all_flags`
call when the policy
is set to
`OLD`
.
can be controlled by the new Dune policy
`DP_TEST_ADD_ALL_FLAGS`
.
## C++: Changelog
...
...
This diff is collapsed.
Click to expand it.
cmake/modules/DuneTestMacros.cmake
+
2
−
8
View file @
efffb029
...
...
@@ -192,12 +192,6 @@
# place to make it easy to construct regular expressions from the label
# names for :code:`ctest -L ${label_regex}`.
#
# .. cmake_param:: NO_ADD_ALL_FLAGS
# :option:
#
# Disable the call to :ref:`add_dune_all_flags` for the test target if
# activated globally by the Dune policy `DP_TEST_ADD_ALL_FLAGS=OLD`.
#
# This function defines the Dune way of adding a test to the testing suite.
# You may either add the executable yourself through :ref:`add_executable`
# and pass it to the :code:`TARGET` option, or you may rely on :ref:`dune_add_test`
...
...
@@ -267,7 +261,7 @@ if(NOT DUNE_MAX_TEST_CORES)
endif
()
function
(
dune_add_test
)
set
(
OPTIONS EXPECT_COMPILE_FAIL EXPECT_FAIL SKIP_ON_77 COMPILE_ONLY PYTHON_TEST
NO_ADD_ALL_FLAGS
)
set
(
OPTIONS EXPECT_COMPILE_FAIL EXPECT_FAIL SKIP_ON_77 COMPILE_ONLY PYTHON_TEST
)
set
(
SINGLEARGS NAME TARGET TIMEOUT WORKING_DIRECTORY
)
set
(
MULTIARGS SOURCES COMPILE_DEFINITIONS COMPILE_FLAGS LINK_LIBRARIES CMD_ARGS MPI_RANKS COMMAND CMAKE_GUARD LABELS
)
cmake_parse_arguments
(
ADDTEST
"
${
OPTIONS
}
"
"
${
SINGLEARGS
}
"
"
${
MULTIARGS
}
"
${
ARGN
}
)
...
...
@@ -363,7 +357,7 @@ function(dune_add_test)
# add all flags to the target if corresponding policy is OLD and not explicitly disabled.
dune_policy
(
GET DP_TEST_ADD_ALL_FLAGS _add_all_flags
)
if
(
_add_all_flags STREQUAL
"OLD"
AND NOT NO_ADD_ALL_FLAGS
)
if
(
_add_all_flags STREQUAL
"OLD"
)
add_dune_all_flags
(
${
ADDTEST_NAME
}
)
endif
()
unset
(
_add_all_flags
)
...
...
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