From c28e83df2fcb52b73a6188653459e149336a1fee Mon Sep 17 00:00:00 2001 From: Chandan Singh Date: Mon, 23 Dec 2019 12:12:45 +0000 Subject: _platform/platform.py: Add alias for IBM AIX 7 powerpc * `uname -m` is unusable in case of IBM AIX 7 as it reports the serial number of the machine. As a workaround, special case it and use the reported processor identifier. * tests/format/optionos.py: Don't use AIX for unsupported architecture `AIX` is special-cased in BuildStream, so use a different system for testing unsupported architectures. --- tests/format/optionos.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/format') diff --git a/tests/format/optionos.py b/tests/format/optionos.py index 92486104e..16177c4fb 100644 --- a/tests/format/optionos.py +++ b/tests/format/optionos.py @@ -26,7 +26,7 @@ DATA_DIR = os.path.dirname(os.path.realpath(__file__)) ("Darwin", None, "Darwiny"), # Test that explicitly provided arches dont error out # when the `uname` reported arch is not supported - ("AIX", "Linux", "Linuxy"), + ("ULTRIX", "Linux", "Linuxy"), ("HaikuOS", "SunOS", "SunOSy"), ], ) @@ -49,7 +49,7 @@ def test_conditionals(cli, datafiles, system, value, expected): @pytest.mark.datafiles(DATA_DIR) def test_unsupported_arch(cli, datafiles): - with override_platform_uname(system="AIX"): + with override_platform_uname(system="ULTRIX"): project = os.path.join(datafiles.dirname, datafiles.basename, "option-os") result = cli.run( project=project, silent=True, args=["show", "--deps", "none", "--format", "%{vars}", "element.bst"] -- cgit v1.2.1