m

Author: dwoz

relenv/buildenv.py

@@ -3,10 +3,16 @@
 """
 Helper for building libraries to install into a relenv environment.
 """
+import json
 import logging
 import sys
 
-from .common import MACOS_DEVELOPMENT_TARGET, RelenvException, get_triplet, work_dirs
+from .common import (
+    MACOS_DEVELOPMENT_TARGET,
+    RelenvException,
+    get_toolchain,
+    get_triplet,
+)
 
 log = logging.getLogger()
 
@@ -22,6 +28,12 @@ def setup_parser(subparsers):
         "buildenv", description="Relenv build environment"
     )
     subparser.set_defaults(func=main)
+    subparser.add_argument(
+        "--json",
+        default=False,
+        action="store_true",
+        help=("Output json to stdout instead of export statments"),
+    )
 
 
 def is_relenv():
@@ -43,9 +55,8 @@ def buildenv(relenv_path=None):
     if sys.platform != "linux":
         raise RelenvException("buildenv is only supported on Linux")
 
-    dirs = work_dirs()
     triplet = get_triplet()
-    toolchain = dirs.toolchain / get_triplet()
+    toolchain = get_toolchain()
     env = {
         "RELENV_BUILDENV": "1",
         "TOOLCHAIN_PATH": f"{toolchain}",
@@ -90,12 +101,13 @@ def main(args):
     if sys.platform != "linux":
         log.error("buildenv is only supported on Linux.")
 
-    # dirs = work_dirs()
-    # triplet = get_triplet()
-    # toolchain = dirs.toolchain / get_triplet()
+    if args.json:
+        print(json.dumps(buildenv()))
+        sys.exit(0)
 
     script = ""
     for k, v in buildenv().items():
         script += f'export {k}="{v}"\n'
 
     print(script)
+    sys.exit(0)

relenv/runtime.py

@@ -839,10 +839,12 @@ def install_cargo_config():
         toolchain = pathlib.Path(env["TOOLCHAIN_PATH"])
     else:
         debug("Unable to set CARGO_HOME ppbt package not installed")
+        return
 
     if not toolchain.exists():
         debug("Unable to set CARGO_HOME no toolchain exists")
         return
+
     cargo_home = dirs.data / "cargo"
     if not cargo_home.exists():
         cargo_home.mkdir()

tests/test_verify_build.py

@@ -4,6 +4,7 @@
 """
 Verify relenv builds.
 """
+import json
 import os
 import pathlib
 import platform
@@ -16,7 +17,7 @@
 import packaging
 import pytest
 
-from relenv.common import DATA_DIR, build_arch, get_triplet
+from relenv.common import build_arch, get_triplet
 
 from .conftest import get_build_version
 
@@ -554,6 +555,17 @@ def test_pip_install_m2crypto_system_ssl(pipexec, pyexec):
 
 @pytest.mark.skip_unless_on_linux
 def test_pip_install_m2crypto_relenv_ssl(pipexec, pyexec, build):
+    p = subprocess.run(
+        [
+            pyexec,
+            "-m",
+            "relenv",
+            "buildenv",
+            "--json",
+        ],
+        capture_output=True,
+    )
+    buildenv = json.loads(p.stdout)
     env = os.environ.copy()
     env["RELENV_BUILDENV"] = "yes"
     env["RELENV_DEBUG"] = "yes"
@@ -569,13 +581,7 @@ def test_pip_install_m2crypto_relenv_ssl(pipexec, pyexec, build):
         stderr=subprocess.PIPE,
     )
     assert p.returncode == 0, "Failed to pip install m2crypto"
-    gcc = str(
-        pathlib.Path(DATA_DIR)
-        / "toolchain"
-        / f"{get_triplet()}"
-        / "bin"
-        / f"{get_triplet()}-gcc"
-    )
+    gcc = str(pathlib.Path(buildenv["TOOLCHAIN_PATH"]) / "bin" / f"{get_triplet()}-gcc")
     include = str(pathlib.Path(build) / "include")
     found_include = False
     for _ in p.stderr.splitlines():
@@ -584,7 +590,7 @@ def test_pip_install_m2crypto_relenv_ssl(pipexec, pyexec, build):
             for arg in line.split():
                 if arg == f"-I{include}":
                     found_include = True
-    assert found_include
+    assert found_include, f"{include}\n{p.stderr.decode()}"
     p = subprocess.run(
         [str(pyexec), "-c", "import M2Crypto"],
         env=env,