Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-08 17:03:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: add Tools/mavproxy_modules to PYTHONPATH in autotest

Browse Source 
So we can find random MAVProxy helper modules like sitl_calibration
This commit is contained in:
Peter Barker 2020-01-01 10:42:45 +11:00 committed by Peter Barker
parent 2518328801
commit 881eadb993
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/autotest/pysim/util.py
View File

@ -372,6 +372,12 @@ def MAVProxy_version():
def start_MAVProxy_SITL(atype, aircraft=None, setup=False, master='tcp:127.0.0.1:5760', def start_MAVProxy_SITL(atype, aircraft=None, setup=False, master='tcp:127.0.0.1:5760',
options=[], logfile=sys.stdout): options=[], logfile=sys.stdout):
"""Launch mavproxy connected to a SITL instance.""" """Launch mavproxy connected to a SITL instance."""
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', ''))
import pexpect import pexpect
global close_list global close_list
MAVPROXY = mavproxy_cmd() MAVPROXY = mavproxy_cmd()
@ -383,7 +389,7 @@ def start_MAVProxy_SITL(atype, aircraft=None, setup=False, master='tcp:127.0.0.1
cmd += ' --aircraft=%s' % aircraft cmd += ' --aircraft=%s' % aircraft
cmd += ' ' + ' '.join(options) cmd += ' ' + ' '.join(options)
cmd += ' --default-modules misc,terrain,wp,rally,fence,param,arm,mode,rc,cmdlong,output' cmd += ' --default-modules misc,terrain,wp,rally,fence,param,arm,mode,rc,cmdlong,output'
ret = pexpect.spawn(cmd, logfile=logfile, encoding=ENCODING, timeout=60) ret = pexpect.spawn(cmd, logfile=logfile, encoding=ENCODING, timeout=60, env=env)
ret.delaybeforesend = 0 ret.delaybeforesend = 0
pexpect_autoclose(ret) pexpect_autoclose(ret)
return ret return ret