Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-02 05:58:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: correct dangling path separator issue in PYTHONPATH

Browse Source
This commit is contained in:
Peter Barker 2020-03-04 17:00:37 +11:00 committed by Peter Barker
parent 8514cb3246
commit 67a3610f54
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,9 +375,11 @@ def start_MAVProxy_SITL(atype, aircraft=None, setup=False, master='tcp:127.0.0.1
local_mp_modules_dir = os.path.abspath( local_mp_modules_dir = os.path.abspath(
os.path.join(__file__, '..', '..', '..', 'mavproxy_modules')) os.path.join(__file__, '..', '..', '..', 'mavproxy_modules'))
env = dict(os.environ) env = dict(os.environ)
env['PYTHONPATH'] = (local_mp_modules_dir + old = env.get('PYTHONPATH', None)
os.pathsep + env['PYTHONPATH'] = local_mp_modules_dir
env.get('PYTHONPATH', '')) if old is not None:
env['PYTHONPATH'] += os.path.pathsep + old
import pexpect import pexpect
global close_list global close_list
cmd = [] cmd = []
@ -392,6 +394,7 @@ def start_MAVProxy_SITL(atype, aircraft=None, setup=False, master='tcp:127.0.0.1
cmd.extend(options) cmd.extend(options)
cmd.extend(['--default-modules', 'misc,terrain,wp,rally,fence,param,arm,mode,rc,cmdlong,output']) cmd.extend(['--default-modules', 'misc,terrain,wp,rally,fence,param,arm,mode,rc,cmdlong,output'])
print("PYTHONPATH: %s" % str(env['PYTHONPATH']))
print("Running: %s" % cmd_as_shell(cmd)) print("Running: %s" % cmd_as_shell(cmd))
ret = pexpect.spawn(cmd[0], cmd[1:], logfile=logfile, encoding=ENCODING, timeout=60, env=env) ret = pexpect.spawn(cmd[0], cmd[1:], logfile=logfile, encoding=ENCODING, timeout=60, env=env)