From 41f5602fea4c1d1637964aaa20525052acaf2fb7 Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Fri, 13 May 2016 17:55:06 -0300 Subject: [PATCH] Tools: sim_vehicle: add local mavproxy modules path to PYTHONPATH That's helpful for users that don't have that in their PYTHONPATH environment variable and want to load a local module. --- Tools/autotest/sim_vehicle.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Tools/autotest/sim_vehicle.py b/Tools/autotest/sim_vehicle.py index f8eba8dfcc..e058a20219 100755 --- a/Tools/autotest/sim_vehicle.py +++ b/Tools/autotest/sim_vehicle.py @@ -8,6 +8,7 @@ import optparse import sys import atexit import os +import os.path import subprocess import tempfile import getpass @@ -618,7 +619,12 @@ def start_mavproxy(opts, stuff): if len(extra_cmd): cmd.extend(['--cmd', extra_cmd]) - run_cmd_blocking("Run MavProxy", cmd) + local_mp_modules_dir = os.path.abspath( + os.path.join(__file__, '..', '..', 'mavproxy_modules')) + env = dict(os.environ) + env['PYTHONPATH'] = local_mp_modules_dir + os.pathsep + env.get('PYTHONPATH', '') + + run_cmd_blocking("Run MavProxy", cmd, env=env) progress("MAVProxy exitted") frame_options = options_for_frame(opts.frame, opts.vehicle, opts)