Skip to content

Commit

Permalink
Prepare for Bazel incompatible changes
Browse files Browse the repository at this point in the history
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")`.
  • Loading branch information
Yannic committed Aug 7, 2019
1 parent 6a2adc0 commit 6fd262e
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 11 deletions.
18 changes: 10 additions & 8 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#
# Bazel Build for Google C++ Testing Framework(Google Test)

load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")

package(default_visibility = ["//visibility:public"])

licenses(["notice"])
Expand Down Expand Up @@ -81,6 +83,10 @@ cc_library(
":has_absl": ["GTEST_HAS_ABSL=1"],
"//conditions:default": [],
}),
features = select({
":windows": ["windows_export_all_symbols"],
"//conditions:default": [],
}),
includes = [
"googlemock",
"googlemock/include",
Expand All @@ -102,20 +108,16 @@ cc_library(
],
"//conditions:default": [],
}),
features = select({
":windows": ["windows_export_all_symbols"],
"//conditions:default": [],
})
)

cc_library(
name = "gtest_main",
srcs = ["googlemock/src/gmock_main.cc"],
deps = [":gtest"],
features = select({
":windows": ["windows_export_all_symbols"],
"//conditions:default": [],
})
}),
deps = [":gtest"],
)

# The following rules build samples of how to use gTest.
Expand All @@ -136,7 +138,7 @@ cc_library(
features = select({
":windows": ["windows_export_all_symbols"],
"//conditions:default": [],
})
}),
)

cc_test(
Expand All @@ -155,11 +157,11 @@ cc_test(
"googletest/samples/sample7_unittest.cc",
"googletest/samples/sample8_unittest.cc",
],
linkstatic = 0,
deps = [
"gtest_sample_lib",
":gtest_main",
],
linkstatic = 0,
)

cc_test(
Expand Down
18 changes: 15 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,19 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# Abseil
http_archive(
name = "com_google_absl",
urls = ["https://github.com/abseil/abseil-cpp/archive/master.zip"],
strip_prefix = "abseil-cpp-master",
name = "com_google_absl",
strip_prefix = "abseil-cpp-master",
urls = ["https://github.com/abseil/abseil-cpp/archive/master.zip"],
)

http_archive(
name = "rules_cc",
strip_prefix = "rules_cc-master",
urls = ["https://github.com/bazelbuild/rules_cc/archive/master.zip"],
)

http_archive(
name = "rules_python",
strip_prefix = "rules_python-master",
urls = ["https://github.com/bazelbuild/rules_python/archive/master.zip"],
)
3 changes: 3 additions & 0 deletions googlemock/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
#
# Bazel Build for Google C++ Testing Framework(Google Test)-googlemock

load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

licenses(["notice"])

# Tests for GMock itself
Expand Down
3 changes: 3 additions & 0 deletions googletest/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
#
# Bazel BUILD for The Google C++ Testing Framework (Google Test)

load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
load("@rules_python//python:defs.bzl", "py_library", "py_test")

licenses(["notice"])

#on windows exclude gtest-tuple.h
Expand Down

0 comments on commit 6fd262e

Please sign in to comment.