buildstream/_options/optionarch.py

@@ -17,7 +17,7 @@
 #  Authors:
 #        Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
 
-import os
+from .._platform import Platform
 from .optionenum import OptionEnum
 
 
@@ -41,8 +41,7 @@ class OptionArch(OptionEnum):
         super(OptionArch, self).load(node, allow_default_definition=False)
 
     def load_default_value(self, node):
-        _, _, _, _, machine_arch = os.uname()
-        return machine_arch
+        return Platform.get_host_os()
 
     def resolve(self):
 

buildstream/_options/optionos.py

+
+#
+#  Copyright (C) 2017 Codethink Limited
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library. If not, see <http://www.gnu.org/licenses/>.
+#
+#  Authors:
+#        Raoul Hidalgo Charman <raoul.hidalgocharman@codethink.co.uk>
+
+import os
+from .optionenum import OptionEnum
+
+
+# OptionOS
+#
+class OptionOS(OptionEnum):
+
+    OPTION_TYPE = 'os'
+
+    def load(self, node):
+        super(OptionOS, self).load(node, allow_default_definition=False)
+
+    def load_default_value(self, node):
+        return os.uname()[0]
+
+    def resolve(self):
+
+        # Validate that the default OS reported by uname() is explicitly
+        # supported by the project, if not overridden by user config or cli.
+        self.validate(self.value)

buildstream/_options/optionpool.py

@@ -28,6 +28,7 @@ from .optionenum import OptionEnum
 from .optionflags import OptionFlags
 from .optioneltmask import OptionEltMask
 from .optionarch import OptionArch
+from .optionos import OptionOS
 
 
 _OPTION_TYPES = {
@@ -36,6 +37,7 @@ _OPTION_TYPES = {
     OptionFlags.OPTION_TYPE: OptionFlags,
     OptionEltMask.OPTION_TYPE: OptionEltMask,
     OptionArch.OPTION_TYPE: OptionArch,
+    OptionOS.OPTION_TYPE: OptionOS,
 }
 
 

buildstream/sandbox/_sandboxremote.py

@@ -65,13 +65,20 @@ class SandboxRemote(Sandbox):
                                  EnvironmentVariable(name=k, value=v)
                                  for (k, v) in environment.items()]
 
+        config = self._get_config()
+        platform = remote_execution_pb2.Platform()
+        platform.properties.extend([remote_execution_pb2.Platform.
+                                    Property(name="os", value=config.build_os),
+                                    remote_execution_pb2.Platform.
+                                    Property(name="arch", value=config.build_arch)])
+
         # Create and send the Command object.
         remote_command = remote_execution_pb2.Command(arguments=command,
                                                       working_directory=working_directory,
                                                       environment_variables=environment_variables,
                                                       output_files=[],
                                                       output_directories=[self._output_directory],
-                                                      platform=None)
+                                                      platform=platform)
         context = self._get_context()
         cascache = context.artifactcache
         # Upload the Command message to the remote CAS server

doc/examples/flatpak-autotools/elements/base/sdk.bst

@@ -5,10 +5,10 @@ sources:
   url: gnomesdk:repo/
   gpg-key: keys/gnome-sdk.gpg
   (?):
-  - arch == "x86_64":
+  - arch == "x86-64":
       track: runtime/org.freedesktop.BaseSdk/x86_64/1.4
       ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882
-  - arch == "i386":
+  - arch == "x86-32":
       track: runtime/org.freedesktop.BaseSdk/i386/1.4
       ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981
 config:

doc/examples/flatpak-autotools/project.conf

@@ -10,6 +10,6 @@ options:
     type: arch
     description: The machine architecture
     values:
-    - x86_64
-    - i386
+    - x86-64
+    - x86-32
 

tests/cachekey/cachekey.py

@@ -144,7 +144,7 @@ DATA_DIR = os.path.join(
 # The cache key test uses a project which exercises all plugins,
 # so we cant run it at all if we dont have them installed.
 #
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
                     reason='Cache keys depend on architecture')
 @pytest.mark.skipif(not IS_LINUX, reason='Only available on linux')
 @pytest.mark.skipif(HAVE_BZR is False, reason="bzr is not available")

tests/examples/autotools.py

@@ -13,8 +13,8 @@ DATA_DIR = os.path.join(
 
 
 # Tests a build of the autotools amhello project on a alpine-linux base runtime
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_build(cli, tmpdir, datafiles):
@@ -38,8 +38,8 @@ def test_autotools_build(cli, tmpdir, datafiles):
 
 
 # Test running an executable built with autotools.
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_run(cli, tmpdir, datafiles):

tests/examples/developing.py

@@ -14,8 +14,8 @@ DATA_DIR = os.path.join(
 
 
 # Test that the project builds successfully
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_build(cli, tmpdir, datafiles):
@@ -37,8 +37,8 @@ def test_autotools_build(cli, tmpdir, datafiles):
 
 
 # Test the unmodified hello command works as expected.
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_run_unmodified_hello(cli, tmpdir, datafiles):
@@ -70,8 +70,8 @@ def test_open_workspace(cli, tmpdir, datafiles):
 
 
 # Test making a change using the workspace
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_make_change_in_workspace(cli, tmpdir, datafiles):

tests/examples/flatpak-autotools.py

@@ -32,8 +32,8 @@ def workaround_setuptools_bug(project):
 
 # Test that a build upon flatpak runtime 'works' - we use the autotools sample
 # amhello project for this.
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE, reason='Only available on linux with ostree')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_build(cli, tmpdir, datafiles):
@@ -57,8 +57,8 @@ def test_autotools_build(cli, tmpdir, datafiles):
 
 
 # Test running an executable built with autotools
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_OSTREE, reason='Only available on linux with ostree')
 @pytest.mark.datafiles(DATA_DIR)
 def test_autotools_run(cli, tmpdir, datafiles):

tests/examples/integration-commands.py

@@ -12,8 +12,8 @@ DATA_DIR = os.path.join(
 )
 
 
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_integration_commands_build(cli, tmpdir, datafiles):
@@ -25,8 +25,8 @@ def test_integration_commands_build(cli, tmpdir, datafiles):
 
 
 # Test running the executable
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_integration_commands_run(cli, tmpdir, datafiles):

tests/examples/junctions.py

@@ -13,8 +13,8 @@ DATA_DIR = os.path.join(
 
 
 # Test that the project builds successfully
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_build(cli, tmpdir, datafiles):
@@ -25,8 +25,8 @@ def test_build(cli, tmpdir, datafiles):
 
 
 # Test the callHello script works as expected.
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_shell_call_hello(cli, tmpdir, datafiles):

tests/examples/running-commands.py

@@ -12,8 +12,8 @@ DATA_DIR = os.path.join(
 )
 
 
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_running_commands_build(cli, tmpdir, datafiles):
@@ -25,8 +25,8 @@ def test_running_commands_build(cli, tmpdir, datafiles):
 
 
 # Test running the executable
-@pytest.mark.skipif(MACHINE_ARCH != 'x86_64',
-                    reason='Examples are writtent for x86_64')
+@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
+                    reason='Examples are writtent for x86-64')
 @pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
 @pytest.mark.datafiles(DATA_DIR)
 def test_running_commands_run(cli, tmpdir, datafiles):

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

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":
+  - machine_arch == "AArch64":
       result: "Aarchy"

tests/format/option-arch/project.conf

@@ -5,5 +5,5 @@ options:
     type: arch
     description: The machine architecture
     values:
-    - arm
-    - aarch64
+    - AArch32
+    - AArch64

tests/format/option-os/element.bst

+kind: autotools
+variables:
+  result: "Nothing"
+  (?):
+  - machine_os == "Linux":
+      result: "Linuxy"
+  - machine_os == "Darwin":
+      result: "Darwiny"
+  - machine_os == "SunOS":
+      result: "SunOSy"
+  - machine_os == "FreeBSD":
+      result: "FreeBSDy"
\ No newline at end of file

tests/format/option-os/project.conf

+name: test
+
+options:
+  machine_os:
+    type: os
+    description: The operating system
+    values:
+    - Linux
+    - Darwin
+    - FreeBSD
+    - SunOS

tests/format/optionarch.py

@@ -29,8 +29,8 @@ def override_uname_arch(name):
 @pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.parametrize("uname,value,expected", [
     # Test explicitly provided arches
-    ('arm', 'arm', 'Army'),
-    ('arm', 'aarch64', 'Aarchy'),
+    ('arm', 'AArch32', 'Army'),
+    ('arm', 'AArch64', 'Aarchy'),
 
     # Test automatically derived arches
     ('arm', None, 'Army'),
@@ -38,8 +38,8 @@ def override_uname_arch(name):
 
     # Test that explicitly provided arches dont error out
     # when the `uname` reported arch is not supported
-    ('i386', 'arm', 'Army'),
-    ('x86_64', 'aarch64', 'Aarchy'),
+    ('i386', 'AArch32', 'Army'),
+    ('x86_64', 'AArch64', 'Aarchy'),
 ])
 def test_conditional(cli, datafiles, uname, value, expected):
     with override_uname_arch(uname):

tests/format/optionos.py

+import os
+import pytest
+from contextlib import contextmanager
+
+from buildstream import _yaml
+from buildstream._exceptions import ErrorDomain, LoadErrorReason
+from tests.testutils.runcli import cli
+
+DATA_DIR = os.path.dirname(os.path.realpath(__file__))
+
+
+@contextmanager
+def override_uname_os(name):
+    orig_uname = os.uname
+    orig_tuple = tuple(os.uname())
+    override_result = (name, orig_tuple[1],
+                       orig_tuple[2], orig_tuple[3],
+                       orig_tuple[4])
+
+    def override():
+        return override_result
+
+    os.uname = override
+    yield
+    os.uname = orig_uname
+
+
+@pytest.mark.datafiles(DATA_DIR)
+@pytest.mark.parametrize("uname,value,expected", [
+    # Test explicitly provided arches
+    ('Darwin', 'Linux', 'Linuxy'),
+    ('SunOS', 'FreeBSD', 'FreeBSDy'),
+
+    # Test automatically derived arches
+    ('Linux', None, 'Linuxy'),
+    ('Darwin', None, 'Darwiny'),
+
+    # Test that explicitly provided arches dont error out
+    # when the `uname` reported arch is not supported
+    ('AIX', 'Linux', 'Linuxy'),
+    ('HaikuOS', 'SunOS', 'SunOSy'),
+])
+def test_conditionals(cli, datafiles, uname, value, expected):
+    with override_uname_os(uname):
+        project = os.path.join(datafiles.dirname, datafiles.basename, 'option-os')
+
+        bst_args = []
+        if value is not None:
+            bst_args += ['--option', 'machine_os', value]
+
+        bst_args += [
+            'show',
+            '--deps', 'none',
+            '--format', '%{vars}',
+            'element.bst'
+        ]
+        result = cli.run(project=project, silent=True, args=bst_args)
+        result.assert_success()
+
+        loaded = _yaml.load_data(result.output)
+        assert loaded['result'] == expected
+
+
+@pytest.mark.datafiles(DATA_DIR)
+def test_unsupported_arch(cli, datafiles):
+
+    with override_uname_os("AIX"):
+        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'
+        ])
+
+        result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.INVALID_DATA)