mesontest: Fix usage of test.env as it can be a build.EnvironmentVariables

1 files changed, 4 insertions, 0 deletions

diff --git a/mesontest.py b/mesontest.py
index 76b64491b..adc6c2f2a 100755
--- a/mesontest.py
+++ b/mesontest.py
@@ -345,6 +345,10 @@ def filter_tests(suite, tests):
 
 def gdbrun(test):
     child_env = os.environ.copy()
+
+    if isinstance(test.env, build.EnvironmentVariables):
+        test.env = test.env.get_env(child_env)
+
     child_env.update(test.env)
     # On success will exit cleanly. On failure gdb will ask user
     # if they really want to exit.