Moved get_env_var over to the wrapper as well

tests/test_build.py

 import re
 from pathlib import Path
 
-from .utils import get_env_var, run_ioc_get_output
+from .utils import run_ioc_get_output
 
 MODULE_VERSION = "0.0.0+0"
 MODULE_VERSION_NO_BUILD = "0.0.0"
@@ -110,7 +110,7 @@ def test_header_install_location(wrapper):
     rc, *_ = wrapper.run_make("cellinstall")
     assert rc == 0
 
-    cell_path = get_env_var(wrapper, "E3_MODULES_INSTALL_LOCATION")
+    cell_path = wrapper.get_env_var("E3_MODULES_INSTALL_LOCATION")
 
     for ext in extensions:
         assert (Path(cell_path) / "include" / "subdir" / f"header.{ext}").is_file()

tests/utils.py

@@ -2,19 +2,6 @@ import time
 
 from run_iocsh import IOC
 
-from .conftest import Wrapper
-
-
-def get_env_var(wrapper: Wrapper, var: str):
-    """
-    Fetch an environment variable from the module build environment
-    """
-    _, out, _ = wrapper.run_make("cellvars")
-    for line in out.split("\n"):
-        if line.startswith(var):
-            return line.split("=")[1].strip()
-    return ""
-
 
 def run_ioc_get_output(module, version, cell_path):
     """