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

autotest: use 'enter 3 times' method to get into CLI

Browse Source 
this doesn't depend on build options
This commit is contained in:
Andrew Tridgell 2011-12-13 10:23:57 +11:00
parent da43b85422
commit 2c0e4c1c02
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/autotest/autotest.py
View File

@ -41,6 +41,7 @@ def dump_logs(atype):
logfile = util.reltopdir('../buildlogs/%s.flashlog' % atype) logfile = util.reltopdir('../buildlogs/%s.flashlog' % atype)
log = open(logfile, mode='w') log = open(logfile, mode='w')
mavproxy = util.start_MAVProxy_SIL(atype, setup=True, logfile=log) mavproxy = util.start_MAVProxy_SIL(atype, setup=True, logfile=log)
mavproxy.send('\n\n\n')
print("navigating menus") print("navigating menus")
mavproxy.expect(']') mavproxy.expect(']')
mavproxy.send("logs\n") mavproxy.send("logs\n")
@ -58,7 +59,7 @@ def dump_logs(atype):
for i in range(numlogs): for i in range(numlogs):
print("Dumping log %u (i=%u)" % (lognums[i], i)) print("Dumping log %u (i=%u)" % (lognums[i], i))
mavproxy.send("dump %u\n" % lognums[i]) mavproxy.send("dump %u\n" % lognums[i])
mavproxy.expect("logs enabled:", timeout=400) mavproxy.expect("logs enabled:", timeout=120)
mavproxy.expect("Log]") mavproxy.expect("Log]")
util.pexpect_close(mavproxy) util.pexpect_close(mavproxy)
util.pexpect_close(sil) util.pexpect_close(sil)

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

@ -141,7 +141,7 @@ def deltree(path):
def build_SIL(atype): def build_SIL(atype):
'''build desktop SIL''' '''build desktop SIL'''
run_cmd("make -f ../libraries/Desktop/Makefile.desktop clean all", run_cmd("make clean sitl",
dir=reltopdir(atype), dir=reltopdir(atype),
checkfail=True) checkfail=True)
return True return True