From 480cd5ed4e2efb52ffeb6eddd11661f9db8b450a Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Thu, 9 Jul 2020 11:40:15 +0200 Subject: [PATCH] mavsdk_tests: load all os environment variables for gazebo client such that OpenGL options are also used for mavsdk_tests when the GUI is enabled. --- test/mavsdk_tests/process_helper.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/mavsdk_tests/process_helper.py b/test/mavsdk_tests/process_helper.py index 24ea86214d..826bd6d9cb 100644 --- a/test/mavsdk_tests/process_helper.py +++ b/test/mavsdk_tests/process_helper.py @@ -238,10 +238,8 @@ class GzclientRunner(Runner): super().__init__(log_dir, model, case, verbose) self.name = "gzclient" self.cwd = workspace_dir - self.env = {"PATH": os.environ['PATH'], - "HOME": os.environ['HOME'], - "GAZEBO_MODEL_PATH": - workspace_dir + "/Tools/sitl_gazebo/models"} + self.env = dict(os.environ, **{ + "GAZEBO_MODEL_PATH": workspace_dir + "/Tools/sitl_gazebo/models"}) self.add_to_env_if_set("DISPLAY") self.cmd = "gzclient" self.args = ["--verbose"]