aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools: do not attach gdb to gdbserver unless --gdb is given

Browse Source
This commit is contained in:
Peter Barker 2017-08-24 21:35:53 +10:00
parent 38297c4d19
commit a7b919f025
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,17 +194,19 @@ def start_SITL(binary, valgrind=False, gdb=False, wipe=False,
cmd = [] cmd = []
if valgrind and os.path.exists('/usr/bin/valgrind'): if valgrind and os.path.exists('/usr/bin/valgrind'):
cmd.extend(['valgrind', '-q', '--log-file=%s' % valgrind_log_filepath(binary=binary, model=model)]) cmd.extend(['valgrind', '-q', '--log-file=%s' % valgrind_log_filepath(binary=binary, model=model)])
if gdb: if gdbserver:
cmd.extend(['gdbserver', 'localhost:3333'])
if gdb:
# attach gdb to the gdbserver:
f = open("/tmp/x.gdb", "w")
f.write("target extended-remote localhost:3333\nc\n")
f.close()
run_cmd('screen -d -m -S ardupilot-gdb bash -c "gdb -x /tmp/x.gdb"')
elif gdb:
f = open("/tmp/x.gdb", "w") f = open("/tmp/x.gdb", "w")
f.write("r\n") f.write("r\n")
f.close() f.close()
cmd.extend(['xterm', '-e', 'gdb', '-x', '/tmp/x.gdb', '--args']) cmd.extend(['xterm', '-e', 'gdb', '-x', '/tmp/x.gdb', '--args'])
if gdbserver:
f = open("/tmp/x.gdb", "w")
f.write("target extended-remote localhost:3333\nc\n")
f.close()
cmd.extend(['gdbserver', 'localhost:3333'])
run_cmd('screen -d -m -S ardupilot-gdb bash -c "gdb -x /tmp/x.gdb"')
cmd.append(binary) cmd.append(binary)
if wipe: if wipe: