summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2018-09-18 08:14:23 +0000
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2018-09-18 08:14:23 +0000
commitf2ae46f8e59212f78336cf3e4adfe4ac40095110 (patch)
treee999108019cd0aa9a8313116a1173153ed1d1804
parentb9c5ff7d395a66268ec30c46d95b0fcb8ea4b952 (diff)
parentffa0bb36367fc5b0e105e9d19344358b7d5ef3e3 (diff)
downloadbuildstream-f2ae46f8e59212f78336cf3e4adfe4ac40095110.tar.gz
Merge branch 'tristan/fix-override-options' into 'master'
Fix override options Closes #658 See merge request BuildStream/buildstream!802
-rw-r--r--buildstream/_project.py3
-rw-r--r--tests/format/option-overrides/element.bst1
-rw-r--r--tests/format/option-overrides/project.conf19
-rw-r--r--tests/format/optionoverrides.py29
4 files changed, 52 insertions, 0 deletions
diff --git a/buildstream/_project.py b/buildstream/_project.py
index f0ca3d71b..03a783e48 100644
--- a/buildstream/_project.py
+++ b/buildstream/_project.py
@@ -598,7 +598,10 @@ class Project():
# any conditionals specified for project option declarations,
# or conditionally specifying the project name; will be ignored.
#
+ # Don't forget to also resolve options in the element and source overrides.
output.options.process_node(config)
+ output.options.process_node(output.element_overrides)
+ output.options.process_node(output.source_overrides)
# Load base variables
output.base_variables = _yaml.node_get(config, Mapping, 'variables')
diff --git a/tests/format/option-overrides/element.bst b/tests/format/option-overrides/element.bst
new file mode 100644
index 000000000..3c29b4ea1
--- /dev/null
+++ b/tests/format/option-overrides/element.bst
@@ -0,0 +1 @@
+kind: autotools
diff --git a/tests/format/option-overrides/project.conf b/tests/format/option-overrides/project.conf
new file mode 100644
index 000000000..c8058f076
--- /dev/null
+++ b/tests/format/option-overrides/project.conf
@@ -0,0 +1,19 @@
+# Test case ensuring that we can use options
+# in the element overrides.
+#
+name: test
+
+options:
+ arch:
+ type: arch
+ description: architecture
+ values: [i686, x86_64]
+
+elements:
+ autotools:
+ variables:
+ (?):
+ - arch == 'i686':
+ conf-global: --host=i686-unknown-linux-gnu
+ - arch == 'x86_64':
+ conf-global: --host=x86_64-unknown-linux-gnu
diff --git a/tests/format/optionoverrides.py b/tests/format/optionoverrides.py
new file mode 100644
index 000000000..e5c37b3a5
--- /dev/null
+++ b/tests/format/optionoverrides.py
@@ -0,0 +1,29 @@
+import os
+import pytest
+from buildstream import _yaml
+from tests.testutils.runcli import cli
+
+# Project directory
+DATA_DIR = os.path.dirname(os.path.realpath(__file__))
+
+
+@pytest.mark.datafiles(DATA_DIR)
+@pytest.mark.parametrize("arch", [('i686'), ('x86_64')])
+def test_override(cli, datafiles, arch):
+ project = os.path.join(datafiles.dirname, datafiles.basename, 'option-overrides')
+
+ bst_args = ['--option', 'arch', arch]
+ bst_args += [
+ 'show',
+ '--deps', 'none',
+ '--format', '%{vars}',
+ 'element.bst'
+ ]
+ result = cli.run(project=project, silent=True, args=bst_args)
+ result.assert_success()
+
+ # See the associated project.conf for the expected values
+ expected_value = '--host={}-unknown-linux-gnu'.format(arch)
+
+ loaded = _yaml.load_data(result.output)
+ assert loaded['conf-global'] == expected_value