From 01f29a51a86fbc399fc755ffed980b931bc8145f Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Tue, 28 Jan 2020 16:35:07 +0100 Subject: [PATCH] mavsdk_tests: DISPLAY env for gazebo, --verbose --- test/mavsdk_tests/mavsdk_test_runner.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/mavsdk_tests/mavsdk_test_runner.py b/test/mavsdk_tests/mavsdk_test_runner.py index 9a1f21e8cb..15121cd9aa 100755 --- a/test/mavsdk_tests/mavsdk_test_runner.py +++ b/test/mavsdk_tests/mavsdk_test_runner.py @@ -128,9 +128,11 @@ class GzserverRunner(Runner): workspace_dir + "/build/px4_sitl_default/build_gazebo", "GAZEBO_MODEL_PATH": workspace_dir + "/Tools/sitl_gazebo/models", - "PX4_SIM_SPEED_FACTOR": str(speed_factor)} + "PX4_SIM_SPEED_FACTOR": str(speed_factor), + "DISPLAY": os.environ['DISPLAY']} self.cmd = "gzserver" - self.args = [workspace_dir + "/Tools/sitl_gazebo/worlds/" + + self.args = ["--verbose", + workspace_dir + "/Tools/sitl_gazebo/worlds/" + model + ".world"] self.log_prefix = "gzserver" @@ -144,8 +146,9 @@ class GzclientRunner(Runner): # workspace_dir + "/build/px4_sitl_default/build_gazebo", "GAZEBO_MODEL_PATH": workspace_dir + "/Tools/sitl_gazebo/models", - "DISPLAY": ":0"} + "DISPLAY": os.environ['DISPLAY']} self.cmd = "gzclient" + self.args = ["--verbose"] self.log_prefix = "gzclient"