From 0e6bef6c9d6c53840a9eb2bc5baedd007c8014fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Wed, 27 May 2020 16:52:26 +0200 Subject: tests/integration/sandbox.py: Test variable expansion in sandbox config --- tests/integration/project/elements/sandbox/build-arch.bst | 12 ++++++++++++ tests/integration/project/project.conf | 1 + tests/integration/sandbox.py | 12 ++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 tests/integration/project/elements/sandbox/build-arch.bst diff --git a/tests/integration/project/elements/sandbox/build-arch.bst b/tests/integration/project/elements/sandbox/build-arch.bst new file mode 100644 index 000000000..d03f36792 --- /dev/null +++ b/tests/integration/project/elements/sandbox/build-arch.bst @@ -0,0 +1,12 @@ +kind: manual + +depends: + - filename: base.bst + type: build + +sandbox: + build-arch: '%{build_arch}' + +config: + build-commands: + - true diff --git a/tests/integration/project/project.conf b/tests/integration/project/project.conf index d30996041..2d3da467b 100644 --- a/tests/integration/project/project.conf +++ b/tests/integration/project/project.conf @@ -13,6 +13,7 @@ options: arch: type: arch description: Current architecture + variable: build_arch values: - x86-64 - aarch64 diff --git a/tests/integration/sandbox.py b/tests/integration/sandbox.py index da0073377..cfa177e5e 100644 --- a/tests/integration/sandbox.py +++ b/tests/integration/sandbox.py @@ -39,3 +39,15 @@ def test_sandbox_shm(cli, datafiles): result = cli.run(project=project, args=["build", element_name]) assert result.exit_code == 0 + + +# Test that variable expansion works in build-arch sandbox config. +# Regression test for https://gitlab.com/BuildStream/buildstream/-/issues/1303 +@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox") +@pytest.mark.datafiles(DATA_DIR) +def test_build_arch(cli, datafiles): + project = str(datafiles) + element_name = "sandbox/build-arch.bst" + + result = cli.run(project=project, args=["build", element_name]) + assert result.exit_code == 0 -- cgit v1.2.1