From 5aa8890e5b00ca777939ce7a46e8ede5e2744257 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 22 Mar 2018 09:11:44 +1100 Subject: [PATCH] Tools: autotest: fail convertgpx if zip or gpsbabel fail --- Tools/autotest/autotest.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py index d89ca798a5..d57c670e81 100755 --- a/Tools/autotest/autotest.py +++ b/Tools/autotest/autotest.py @@ -137,14 +137,21 @@ def build_parameters(): def convert_gpx(): """Convert any tlog files to GPX and KML.""" mavlog = glob.glob(buildlogs_path("*.tlog")) + passed = True for m in mavlog: util.run_cmd(util.reltopdir("modules/mavlink/pymavlink/tools/mavtogpx.py") + " --nofixcheck " + m) gpx = m + '.gpx' kml = m + '.kml' - util.run_cmd('gpsbabel -i gpx -f %s -o kml,units=m,floating=1,extrude=1 -F %s' % (gpx, kml), checkfail=False) - util.run_cmd('zip %s.kmz %s.kml' % (m, m), checkfail=False) + try: + util.run_cmd('gpsbabel -i gpx -f %s -o kml,units=m,floating=1,extrude=1 -F %s' % (gpx, kml)) + except CalledProcessError as e: + passed = False + try: + util.run_cmd('zip %s.kmz %s.kml' % (m, m)) + except CalledProcessError as e: + passed = False util.run_cmd("mavflightview.py --imagefile=%s.png %s" % (m, m)) - return True + return passed def test_prerequisites():