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

Bazel build files have an extra ] if there are no depenedencies #9480

Merged
merged 3 commits into from Aug 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion conan/tools/google/bazeldeps.py
Expand Up @@ -59,8 +59,8 @@ def _get_dependency_buildfile_content(self, dependency):
{% for lib in libs %}
":{{ lib }}_precompiled",
{% endfor %}
{% endif %}
],
{% endif %}
)

""")
Expand Down
20 changes: 20 additions & 0 deletions conans/test/unittests/tools/google/test_bazeldeps.py
@@ -1,5 +1,6 @@
import mock
from mock import Mock
import re

from conan.tools.google import BazelDeps
from conans import ConanFile
Expand Down Expand Up @@ -36,6 +37,25 @@ def test_bazeldeps_dependency_buildfiles():
assert 'linkopts = ["-lsystem_lib1"],' in dependency_content
assert 'deps = [\n \n ":lib1_precompiled",' in dependency_content

def test_bazeldeps_interface_buildfiles():
conanfile = ConanFile(Mock(), None)

cpp_info = CppInfo("mypkg", "dummy_root_folder2")

conanfile_dep = ConanFile(Mock(), None)
conanfile_dep.cpp_info = cpp_info
conanfile_dep._conan_node = Mock()
conanfile_dep._conan_node.ref = ConanFileReference.loads("OriginalDepName/2.0")

with mock.patch('conans.ConanFile.dependencies', new_callable=mock.PropertyMock) as mock_deps:
req = Requirement(ConanFileReference.loads("OriginalDepName/1.0"))
mock_deps.return_value = ConanFileDependencies({req: ConanFileInterface(conanfile_dep)})

bazeldeps = BazelDeps(conanfile)

dependency = next(iter(bazeldeps._conanfile.dependencies.host.values()))
dependency_content = re.sub(r"\s", "", bazeldeps._get_dependency_buildfile_content(dependency))
assert(dependency_content == 'load("@rules_cc//cc:defs.bzl","cc_import","cc_library")cc_library(name="OriginalDepName",hdrs=glob(["include/**"]),includes=["include"],visibility=["//visibility:public"],)')

def test_bazeldeps_main_buildfile():
expected_content = [
Expand Down