-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add common compilation flags to tests [BUILD-448] #25
Open
krisukox
wants to merge
1
commit into
main
Choose a base branch
from
krisukox/common-c-flags-test
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+15
−4
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -202,7 +202,7 @@ def swift_cc_test_library(**kwargs): | |
"""Wraps cc_library to enforce Swift test library conventions. | ||
|
||
Args: | ||
**kwargs: See https://bazel.build/reference/be/c-cpp#cc_test | ||
**kwargs: See https://bazel.build/reference/be/c-cpp#cc_library | ||
|
||
The following additional attributes are supported: | ||
|
||
|
@@ -211,16 +211,20 @@ def swift_cc_test_library(**kwargs): | |
be relative to the package this macro is called from. | ||
""" | ||
local_includes = _construct_local_includes(kwargs.pop("local_includes", [])) | ||
nocopts = kwargs.pop("nocopts", []) | ||
|
||
kwargs["copts"] = (kwargs["copts"] if "copts" in kwargs else []) + local_includes | ||
copts = _common_c_opts(nocopts, pedantic = False) | ||
copts = local_includes + copts | ||
kwargs["copts"] = copts + (kwargs["copts"] if "copts" in kwargs else []) | ||
native.cc_library(**kwargs) | ||
|
||
def swift_cc_test(name, type, **kwargs): | ||
def swift_cc_test(name, type, common_c_opts = False, **kwargs): | ||
"""Wraps cc_test to enforce Swift testing conventions. | ||
|
||
Args: | ||
name: A unique name for this rule. | ||
type: Specifies whether the test is a unit or integration test. | ||
common_c_opts: Bool flag that indicates if common compilation flags will be added. Default False. | ||
|
||
These are passed to cc_test as tags which enables running | ||
these test types seperately: `bazel test --test_tag_filters=unit //...` | ||
|
@@ -239,7 +243,14 @@ def swift_cc_test(name, type, **kwargs): | |
|
||
local_includes = _construct_local_includes(kwargs.pop("local_includes", [])) | ||
|
||
kwargs["copts"] = (kwargs["copts"] if "copts" in kwargs else []) + local_includes | ||
copts = [] | ||
if common_c_opts: | ||
nocopts = kwargs.pop("nocopts", []) | ||
copts = _common_c_opts(nocopts, pedantic = False) | ||
copts = local_includes + copts | ||
|
||
kwargs["copts"] = copts + (kwargs["copts"] if "copts" in kwargs else []) | ||
kwargs["name"] = name | ||
kwargs["tags"] = (kwargs["tags"] if "tags" in kwargs else []) + [type] | ||
kwargs["linkstatic"] = (kwargs["linkstatic"] if "linkstatic" in kwargs else True) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the reason for making this the default? |
||
native.cc_test(**kwargs) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Were there things that failed to build unless this was an optional parameter?
Guessing in a lot of cases we need to remove certain flags via
nocopts
.