mirror of https://github.com/ArduPilot/ardupilot
autotest: neaten start of MAVProxy, add debug showing cmdline
Attempting to diagnose failure of MAVProxy to find rline.py on the autotest server.
This commit is contained in:
parent
566732a2d7
commit
8deaa36f5a
|
@ -380,16 +380,21 @@ def start_MAVProxy_SITL(atype, aircraft=None, setup=False, master='tcp:127.0.0.1
|
|||
env.get('PYTHONPATH', ''))
|
||||
import pexpect
|
||||
global close_list
|
||||
MAVPROXY = mavproxy_cmd()
|
||||
cmd = MAVPROXY + ' --master=%s --out=127.0.0.1:14550' % master
|
||||
cmd = []
|
||||
cmd.append(mavproxy_cmd())
|
||||
cmd.extend(['--master', master])
|
||||
cmd.extend(['--out', '127.0.0.1:14550'])
|
||||
if setup:
|
||||
cmd += ' --setup'
|
||||
cmd.append('--setup')
|
||||
if aircraft is None:
|
||||
aircraft = 'test.%s' % atype
|
||||
cmd += ' --aircraft=%s' % aircraft
|
||||
cmd += ' ' + ' '.join(options)
|
||||
cmd += ' --default-modules misc,terrain,wp,rally,fence,param,arm,mode,rc,cmdlong,output'
|
||||
ret = pexpect.spawn(cmd, logfile=logfile, encoding=ENCODING, timeout=60, env=env)
|
||||
cmd.extend(['--aircraft', aircraft])
|
||||
cmd.extend(options)
|
||||
cmd.extend(['--default-modules', 'misc,terrain,wp,rally,fence,param,arm,mode,rc,cmdlong,output'])
|
||||
|
||||
print("Running: %s" % cmd_as_shell(cmd))
|
||||
|
||||
ret = pexpect.spawn(cmd[0], cmd[1:], logfile=logfile, encoding=ENCODING, timeout=60, env=env)
|
||||
ret.delaybeforesend = 0
|
||||
pexpect_autoclose(ret)
|
||||
return ret
|
||||
|
|
Loading…
Reference in New Issue