Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tools: Rename scrimmage template to have .j2 extension 

* This fixes an error in pre-commit's check-xml hook
  * Tools/autotest/template/scrimmage.xml: Failed to xml parse (Tools/autotest/template/scrimmage.xml:8:7: not well-formed (invalid token))
* Since it's a template file, it is not parseable as XML till after it's rendered by jinja

Signed-off-by: Ryan Friedman <ryanfriedman5410+github@gmail.com>
This commit is contained in:
Ryan Friedman 2023-08-21 20:23:17 -06:00 committed by Peter Barker
parent d47b60b92a
commit 868f562e1b
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/autotest/sim_vehicle.py
View File

@ -1617,7 +1617,7 @@ if cmd_opts.frame in ['scrimmage-plane', 'scrimmage-copter']:
entities[i][k] = v entities[i][k] = v
config['entities'] = list(entities.values()) config['entities'] = list(entities.values())
env = Environment(loader=FileSystemLoader(os.path.join(autotest_dir, 'template'))) env = Environment(loader=FileSystemLoader(os.path.join(autotest_dir, 'template')))
mission = env.get_template('scrimmage.xml').render(**config) mission = env.get_template('scrimmage.xml.j2').render(**config)
tmp = mkstemp() tmp = mkstemp()
atexit.register(os.remove, tmp[1]) atexit.register(os.remove, tmp[1])

0
Tools/autotest/template/scrimmage.xml → Tools/autotest/template/scrimmage.xml.j2
View File