Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-29 20:18:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: changed mavlink log names to *.tlog

Browse Source 
easier to view in MP
This commit is contained in:
Andrew Tridgell 2013-04-28 15:01:31 +10:00
parent e8c71c1449
commit 9904bcd9aa
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/autotest/apmrover2.py
View File

@ -107,7 +107,7 @@ def drive_APMrover2(viewerip=None):
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)
buildlog = util.reltopdir("../buildlogs/APMrover2-test.mavlog") buildlog = util.reltopdir("../buildlogs/APMrover2-test.tlog")
print("buildlog=%s" % buildlog) print("buildlog=%s" % buildlog)
if os.path.exists(buildlog): if os.path.exists(buildlog):
os.unlink(buildlog) os.unlink(buildlog)

2
Tools/autotest/arducopter.py
View File

@ -382,7 +382,7 @@ def fly_ArduCopter(viewerip=None):
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)
buildlog = util.reltopdir("../buildlogs/ArduCopter-test.mavlog") buildlog = util.reltopdir("../buildlogs/ArduCopter-test.tlog")
print("buildlog=%s" % buildlog) print("buildlog=%s" % buildlog)
if os.path.exists(buildlog): if os.path.exists(buildlog):
os.unlink(buildlog) os.unlink(buildlog)

2
Tools/autotest/arduplane.py
View File

@ -257,7 +257,7 @@ def fly_ArduPlane(viewerip=None):
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)
buildlog = util.reltopdir("../buildlogs/ArduPlane-test.mavlog") buildlog = util.reltopdir("../buildlogs/ArduPlane-test.tlog")
print("buildlog=%s" % buildlog) print("buildlog=%s" % buildlog)
if os.path.exists(buildlog): if os.path.exists(buildlog):
os.unlink(buildlog) os.unlink(buildlog)

8
Tools/autotest/autotest.py
View File

@ -101,9 +101,9 @@ def build_examples():
def convert_gpx(): def convert_gpx():
'''convert any mavlog files to GPX and KML''' '''convert any tlog files to GPX and KML'''
import glob import glob
mavlog = glob.glob(util.reltopdir("../buildlogs/*.mavlog")) mavlog = glob.glob(util.reltopdir("../buildlogs/*.tlog"))
for m in mavlog: for m in mavlog:
util.run_cmd(util.reltopdir("../mavlink/pymavlink/examples/mavtogpx.py") + " --nofixcheck " + m) util.run_cmd(util.reltopdir("../mavlink/pymavlink/examples/mavtogpx.py") + " --nofixcheck " + m)
gpx = m + '.gpx' gpx = m + '.gpx'
@ -129,7 +129,7 @@ def alarm_handler(signum, frame):
results.addglob("Google Earth track", '*.kmz') results.addglob("Google Earth track", '*.kmz')
results.addfile('Full Logs', 'autotest-output.txt') results.addfile('Full Logs', 'autotest-output.txt')
results.addglob('DataFlash Log', '*.flashlog') results.addglob('DataFlash Log', '*.flashlog')
results.addglob("MAVLink log", '*.mavlog') results.addglob("MAVLink log", '*.tlog')
results.addfile('ArduPlane build log', 'ArduPlane.txt') results.addfile('ArduPlane build log', 'ArduPlane.txt')
results.addfile('ArduPlane defaults', 'ArduPlane.defaults.txt') results.addfile('ArduPlane defaults', 'ArduPlane.defaults.txt')
results.addfile('ArduCopter build log', 'ArduCopter.txt') results.addfile('ArduCopter build log', 'ArduCopter.txt')
@ -364,7 +364,7 @@ def run_tests(steps):
results.addglob("Google Earth track", '*.kmz') results.addglob("Google Earth track", '*.kmz')
results.addfile('Full Logs', 'autotest-output.txt') results.addfile('Full Logs', 'autotest-output.txt')
results.addglob('DataFlash Log', '*.flashlog') results.addglob('DataFlash Log', '*.flashlog')
results.addglob("MAVLink log", '*.mavlog') results.addglob("MAVLink log", '*.tlog')
results.addglob("GPX track", '*.gpx') results.addglob("GPX track", '*.gpx')
results.addfile('ArduPlane build log', 'ArduPlane.txt') results.addfile('ArduPlane build log', 'ArduPlane.txt')
results.addfile('ArduPlane code size', 'ArduPlane.sizes.txt') results.addfile('ArduPlane code size', 'ArduPlane.sizes.txt')

10
Tools/autotest/autotest_jenkins.py
View File

@ -86,9 +86,9 @@ def dump_logs(atype):
return True return True
def convert_gpx(): def convert_gpx():
'''convert any mavlog files to GPX and KML''' '''convert any tlog files to GPX and KML'''
import glob import glob
mavlog = glob.glob(util.reltopdir("../buildlogs/*.mavlog")) mavlog = glob.glob(util.reltopdir("../buildlogs/*.tlog"))
for m in mavlog: for m in mavlog:
util.run_cmd(util.reltopdir("../mavlink/pymavlink/examples/mavtogpx.py") + " --nofixcheck " + m) util.run_cmd(util.reltopdir("../mavlink/pymavlink/examples/mavtogpx.py") + " --nofixcheck " + m)
gpx = m + '.gpx' gpx = m + '.gpx'
@ -113,7 +113,7 @@ def alarm_handler(signum, frame):
util.pexpect_close_all() util.pexpect_close_all()
results.addfile('Full Logs', 'autotest-output.txt') results.addfile('Full Logs', 'autotest-output.txt')
results.addglob('DataFlash Log', '*.flashlog') results.addglob('DataFlash Log', '*.flashlog')
results.addglob("MAVLink log", '*.mavlog') results.addglob("MAVLink log", '*.tlog')
results.addfile('ArduPlane build log', 'ArduPlane.txt') results.addfile('ArduPlane build log', 'ArduPlane.txt')
results.addfile('ArduPlane defaults', 'ArduPlane.defaults.txt') results.addfile('ArduPlane defaults', 'ArduPlane.defaults.txt')
results.addfile('ArduCopter build log', 'ArduCopter.txt') results.addfile('ArduCopter build log', 'ArduCopter.txt')
@ -170,7 +170,7 @@ def fly_ArduCopter_scripted(testname):
logfile = mavproxy.match.group(1) logfile = mavproxy.match.group(1)
print("LOGFILE %s" % logfile) print("LOGFILE %s" % logfile)
buildlog = util.reltopdir("../buildlogs/ArduCopter-test.mavlog") buildlog = util.reltopdir("../buildlogs/ArduCopter-test.tlog")
print("buildlog=%s" % buildlog) print("buildlog=%s" % buildlog)
if os.path.exists(buildlog): if os.path.exists(buildlog):
os.unlink(buildlog) os.unlink(buildlog)
@ -359,7 +359,7 @@ def run_tests(tests):
results.addglob("Google Earth track", '*.kmz') results.addglob("Google Earth track", '*.kmz')
results.addfile('Full Logs', 'autotest-output.txt') results.addfile('Full Logs', 'autotest-output.txt')
results.addglob('DataFlash Log', '*.flashlog') results.addglob('DataFlash Log', '*.flashlog')
results.addglob("MAVLink log", '*.mavlog') results.addglob("MAVLink log", '*.tlog')
results.addglob("GPX track", '*.gpx') results.addglob("GPX track", '*.gpx')
unit_test_results.num_tests = len(results.tests) unit_test_results.num_tests = len(results.tests)