mirror of https://github.com/ArduPilot/ardupilot
waf: help diagnose dronecangen errors
This commit is contained in:
parent
38b5d942fd
commit
eaf40fbfb3
|
@ -185,6 +185,7 @@ jobs:
|
|||
- name: run dronecan dsdlc generator test
|
||||
run: |
|
||||
PATH="/github/home/.local/bin:$PATH"
|
||||
python -m pip install --upgrade dronecan
|
||||
python modules/DroneCAN/dronecan_dsdlc/dronecan_dsdlc.py -O dsdlc_generated modules/DroneCAN/DSDL/uavcan modules/DroneCAN/DSDL/dronecan modules/DroneCAN/DSDL/com --run-test
|
||||
|
||||
- name: build sitl_periph_universal
|
||||
|
|
|
@ -9,6 +9,7 @@ from waflib.TaskGen import feature, before_method, extension
|
|||
import os
|
||||
import os.path
|
||||
from xml.etree import ElementTree as et
|
||||
import subprocess
|
||||
|
||||
class dronecangen(Task.Task):
|
||||
"""generate uavcan header files"""
|
||||
|
@ -21,9 +22,10 @@ class dronecangen(Task.Task):
|
|||
src = self.env.get_flat('SRC')
|
||||
dsdlc = self.env.get_flat("DC_DSDL_COMPILER")
|
||||
|
||||
ret = self.exec_command(['{}'.format(python),
|
||||
'{}'.format(dsdlc),
|
||||
'-O{}'.format(out)] + [x.abspath() for x in self.inputs])
|
||||
cmd = ['{}'.format(python),
|
||||
'{}'.format(dsdlc),
|
||||
'-O{}'.format(out)] + [x.abspath() for x in self.inputs]
|
||||
ret = self.exec_command(cmd)
|
||||
if ret != 0:
|
||||
# ignore if there was a signal to the interpreter rather
|
||||
# than a real error in the script. Some environments use a
|
||||
|
@ -32,6 +34,9 @@ class dronecangen(Task.Task):
|
|||
Logs.warn('dronecangen crashed with code: {}'.format(ret))
|
||||
ret = 0
|
||||
else:
|
||||
Logs.warn('dronecangen: cmd=%s ' % str(cmd))
|
||||
# re-run command with stdout visible to see errors
|
||||
subprocess.call(cmd)
|
||||
Logs.error('dronecangen returned {} error code'.format(ret))
|
||||
return ret
|
||||
|
||||
|
|
Loading…
Reference in New Issue