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

[fix] Use 'profile_build' (if given) to create graph for the test_package functionality #7182

Merged
merged 8 commits into from
Jun 30, 2020
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion conans/client/graph/graph_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,22 @@ def load_consumer_conanfile(self, conanfile_path, info_folder,
graph_lock = graph_lock_file.graph_lock
self._output.info("Using lockfile: '{}/conan.lock'".format(info_folder))
profile_host = graph_lock_file.profile_host
profile_build = graph_lock_file.profile_build
self._output.info("Using cached profile from lockfile")
except IOError: # Only if file is missing
graph_lock = None
# This is very dirty, should be removed for Conan 2.0 (source() method only)
profile_host = self._cache.default_profile
profile_host.process_settings(self._cache)
profile_build = None
name, version, user, channel = None, None, None, None
else:
name, version, user, channel, _ = graph_info.root
profile_host.process_settings(self._cache, preprocess=False)
# This is the hack of recovering the options from the graph_info
profile_host.options.update(graph_info.options)
if profile_build:
profile_build.process_settings(self._cache, preprocess=False)
if conanfile_path.endswith(".py"):
lock_python_requires = None
if graph_lock and not test: # Only lock python requires if it is not test_package
Expand All @@ -88,13 +92,18 @@ def load_consumer_conanfile(self, conanfile_path, info_folder,
name=name, version=version,
user=user, channel=channel,
lock_python_requires=lock_python_requires)

if profile_build:
conanfile.settings_build = profile_build.processed_settings.copy()
conanfile.settings_target = None

if test:
conanfile.display_name = "%s (test package)" % str(test)
conanfile.output.scope = conanfile.display_name

run_configure_method(conanfile, down_options=None, down_ref=None, ref=None)
else:
conanfile = self._loader.load_conanfile_txt(conanfile_path, profile_host)
conanfile = self._loader.load_conanfile_txt(conanfile_path, profile_host=profile_host)

load_deps_info(info_folder, conanfile, required=deps_info_required)

Expand Down
1 change: 0 additions & 1 deletion conans/test/functional/build_helpers/cmake_targets_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os
import platform
import unittest

Expand Down
78 changes: 78 additions & 0 deletions conans/test/functional/cross_building/test_package_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import textwrap
import unittest

from jinja2 import Template
from parameterized import parameterized

from conans.client.tools import save
from conans.test.utils.tools import TestClient


class TestPackageTestCase(unittest.TestCase):
conanfile_tpl = Template(textwrap.dedent("""
from conans import ConanFile, tools

class Recipe(ConanFile):
settings = "os"
{{ build_requires|default("") }}

{% raw %}
def build(self):
self.output.info(">> settings.os: {}".format(self.settings.os))
self.output.info(">> settings_build.os: {}".format(self.settings_build.os))
self.output.info(">> tools.get_env('INFO'): {}".format(tools.get_env("INFO")))

def package_info(self):
setattr(self.env_info, "INFO", "{}-{}".format(self.name, self.settings.os))

def test(self):
pass
{% endraw %}

"""))

conanfile_br = conanfile_tpl.render()
conanfile = conanfile_tpl.render(build_requires='build_requires = "br1/version"')
conanfile_test = conanfile_tpl.render(build_requires='build_requires = "br2/version"')

settings_yml = textwrap.dedent("""
os:
Host:
Build:
""")

@parameterized.expand([("create conanfile.py name/version@",),
("test test_package/conanfile.py name/version@",)])
def test_command(self, command):
t = TestClient()
save(t.cache.settings_path, self.settings_yml)
t.save({'br.py': self.conanfile_br,
'conanfile.py': self.conanfile,
'test_package/conanfile.py': self.conanfile_test,
'profile_host': '[settings]\nos=Host',
'profile_build': '[settings]\nos=Build', })
t.run("export br.py br1/version@")
t.run("export br.py br2/version@")
t.run("export conanfile.py name/version@")

# Execute the actual command we are testing
t.run(command + " --build=missing --profile:host=profile_host --profile:build=profile_build")

# Build requires are built in the 'build' context:
self.assertIn("br1/version: >> settings.os: Build", t.out)
self.assertIn("br1/version: >> settings_build.os: Build", t.out)
self.assertIn("br1/version: >> tools.get_env('INFO'): None", t.out)

self.assertIn("br2/version: >> settings.os: Build", t.out)
self.assertIn("br2/version: >> settings_build.os: Build", t.out)
self.assertIn("br2/version: >> tools.get_env('INFO'): None", t.out)

# Package 'name' is built for the 'host' context (br1 as build_requirement)
self.assertIn("name/version: >> settings.os: Host", t.out)
self.assertIn("name/version: >> settings_build.os: Build", t.out)
self.assertIn("name/version: >> tools.get_env('INFO'): br1-Build", t.out)

# Test_package is executed with the same profiles as the package itself
self.assertIn("name/version (test package): >> settings.os: Host", t.out)
self.assertIn("name/version (test package): >> settings_build.os: Build", t.out)
self.assertIn("name/version (test package): >> tools.get_env('INFO'): br2-Build", t.out)