diff options
| author | Raoul Hidalgo Charman <raoul.hidalgocharman@codethink.co.uk> | 2018-11-22 17:27:20 +0000 |
|---|---|---|
| committer | Raoul Hidalgo Charman <raoul.hidalgocharman@codethink.co.uk> | 2018-12-05 10:44:02 +0000 |
| commit | 9f75c274a56855c4c6dd625c2d4216d82febde75 (patch) | |
| tree | 6237c037779217e4b664a4ba7381170d672dce42 /tests/format | |
| parent | 1ad35fcd1bbb4a89e177da44303cf95e5a3b659d (diff) | |
| download | buildstream-9f75c274a56855c4c6dd625c2d4216d82febde75.tar.gz | |
optionarch.py: update to use same arch names as SandboxConfig
Also update tests to be consistent with this
Diffstat (limited to 'tests/format')
| -rw-r--r-- | tests/format/list-directive-type-error/project.conf | 2 | ||||
| -rw-r--r-- | tests/format/option-arch/element.bst | 2 | ||||
| -rw-r--r-- | tests/format/option-arch/project.conf | 2 | ||||
| -rw-r--r-- | tests/format/optionarch.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/format/list-directive-type-error/project.conf b/tests/format/list-directive-type-error/project.conf index 1dd0f1b0a..79f73402b 100644 --- a/tests/format/list-directive-type-error/project.conf +++ b/tests/format/list-directive-type-error/project.conf @@ -4,4 +4,4 @@ options: arch: type: arch description: Example architecture option - values: [ x86_32, x86_64, aarch64 ] + values: [ x86-32, x86-64, aarch64 ]
\ No newline at end of file diff --git a/tests/format/option-arch/element.bst b/tests/format/option-arch/element.bst index 4da01d889..2528d9170 100644 --- a/tests/format/option-arch/element.bst +++ b/tests/format/option-arch/element.bst @@ -2,7 +2,7 @@ kind: autotools variables: result: "Nothing" (?): - - machine_arch == "arm": + - machine_arch == "aarch32": result: "Army" - machine_arch == "aarch64": result: "Aarchy" diff --git a/tests/format/option-arch/project.conf b/tests/format/option-arch/project.conf index a2c3ddf9a..8b94232cf 100644 --- a/tests/format/option-arch/project.conf +++ b/tests/format/option-arch/project.conf @@ -5,5 +5,5 @@ options: type: arch description: The machine architecture values: - - arm + - aarch32 - aarch64 diff --git a/tests/format/optionarch.py b/tests/format/optionarch.py index 4c126aa87..901b6e2da 100644 --- a/tests/format/optionarch.py +++ b/tests/format/optionarch.py @@ -29,7 +29,7 @@ def override_uname_arch(name): @pytest.mark.datafiles(DATA_DIR) @pytest.mark.parametrize("uname,value,expected", [ # Test explicitly provided arches - ('arm', 'arm', 'Army'), + ('arm', 'aarch32', 'Army'), ('arm', 'aarch64', 'Aarchy'), # Test automatically derived arches @@ -38,7 +38,7 @@ def override_uname_arch(name): # Test that explicitly provided arches dont error out # when the `uname` reported arch is not supported - ('i386', 'arm', 'Army'), + ('i386', 'aarch32', 'Army'), ('x86_64', 'aarch64', 'Aarchy'), ]) def test_conditional(cli, datafiles, uname, value, expected): |