Skip to content
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

Prepare for Bazel incompatible changes #2381

Merged
merged 2 commits into from
Aug 19, 2019
Merged

Conversation

Yannic
Copy link
Contributor

@Yannic Yannic commented Aug 7, 2019

Fixes googletest for upcoming --incompatible_load_cc_rules_from_bzl (bazelbuild/bazel#8743) and --incompatible_load_python_rules_from_bzl (bazelbuild/bazel#9006).

This change was automatically generated with
buildifier -lint=fix -warnings=all $(find . -name "BUILD" -o -name "BUILD.bazel" -o -name "*.bzl").

Fixes googletest for upcoming `--incompatible_load_cc_rules_from_bzl` (bazelbuild/bazel#8743) and `--incompatible_load_python_rules_from_bzl` (bazelbuild/bazel#9006).

This change was automatically generated with `buildifier -lint=fix -warnings=all $(find . -name "BUILD" -o -name "BUILD.bazel" -o -name "*.bzl")`.
@@ -155,11 +157,11 @@ cc_test(
"googletest/samples/sample7_unittest.cc",
"googletest/samples/sample8_unittest.cc",
],
linkstatic = 0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there is no good reason to move this line from previous location.Could you please limit the changes to the actual factual changes to remove the noise.

@@ -81,6 +83,10 @@ cc_library(
":has_absl": ["GTEST_HAS_ABSL=1"],
"//conditions:default": [],
}),
features = select({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there is no good reason to move this line from previous location.Could you please limit the changes to the actual factual changes to remove the noise.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

buildifier automatically formats BUILD files in the canonical way when it applies fixes, so the new location is the correct one. I can revert to the old format manually, but I don't think it adds a lot of noise, and the next person editing the BUILD file will likely do the same changes again.

(Dito other comments)

features = select({
":windows": ["windows_export_all_symbols"],
"//conditions:default": [],
})
}),
deps = [":gtest"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there is no good reason to move this line from previous location.Could you please limit the changes to the actual factual changes to remove the noise.

Copy link
Contributor Author

@Yannic Yannic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your review!

@@ -81,6 +83,10 @@ cc_library(
":has_absl": ["GTEST_HAS_ABSL=1"],
"//conditions:default": [],
}),
features = select({
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

buildifier automatically formats BUILD files in the canonical way when it applies fixes, so the new location is the correct one. I can revert to the old format manually, but I don't think it adds a lot of noise, and the next person editing the BUILD file will likely do the same changes again.

(Dito other comments)

gennadiycivil pushed a commit that referenced this pull request Aug 15, 2019
  - 263602063 Import OSS PR #2381 https://github.com/google/googletest/... by misterg <misterg@google.com>

PiperOrigin-RevId: 263602063
gennadiycivil pushed a commit that referenced this pull request Aug 15, 2019
  - 263623083 Import OSS PR #2381 https://github.com/google/googletest/... by misterg <misterg@google.com>

PiperOrigin-RevId: 263623083
gennadiycivil added a commit that referenced this pull request Aug 19, 2019
PiperOrigin-RevId: 264186624
gennadiycivil added a commit that referenced this pull request Aug 19, 2019
PiperOrigin-RevId: 264186624
@gennadiycivil gennadiycivil merged commit 800c9b3 into google:master Aug 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants