michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: runners: sort runner lists

Browse source 
This should help avoid merge conflicts in the future.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2019-11-06 09:08:31 -08:00 • committed by Andrew Boie
commit 50df6f3734
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/west_commands/runners/__init__.py
View file

@ -10,24 +10,25 @@ from runners.core import ZephyrBinaryRunner, MissingProgram
# Explicitly silence the unused import warning. # Explicitly silence the unused import warning.
# flake8: noqa: F401 # flake8: noqa: F401
# Keep this list sorted by runner name.
from runners import arc from runners import arc
from runners import blackmagicprobe
from runners import bossac from runners import bossac
from runners import dediprog from runners import dediprog
from runners import dfu from runners import dfu
from runners import esp32 from runners import esp32
from runners import hifive1 from runners import hifive1
from runners import intel_s1000
from runners import jlink from runners import jlink
from runners import misc
from runners import nios2 from runners import nios2
from runners import nrfjprog from runners import nrfjprog
from runners import nsim from runners import nsim
from runners import openocd from runners import openocd
from runners import pyocd from runners import pyocd
from runners import qemu from runners import qemu
from runners import xtensa
from runners import intel_s1000
from runners import blackmagicprobe
from runners import stm32flash from runners import stm32flash
from runners import misc from runners import xtensa
def get_runner_cls(runner): def get_runner_cls(runner):
'''Get a runner's class object, given its name.''' '''Get a runner's class object, given its name.'''

24
scripts/west_commands/tests/test_imports.py
View file

@ -12,8 +12,24 @@ def test_runner_imports():
# tree-wide refactorings for runners that don't have their own # tree-wide refactorings for runners that don't have their own
# test suites. # test suites.
runner_names = set(r.name() for r in ZephyrBinaryRunner.get_runners()) runner_names = set(r.name() for r in ZephyrBinaryRunner.get_runners())
expected = set(('arc-nsim', 'bossac', 'dfu-util', 'em-starterkit', 'esp32',
'hifive1', 'jlink', 'nios2', 'nrfjprog', 'openocd', 'pyocd', # Please keep this sorted alphabetically.
'qemu', 'xtensa', 'intel_s1000', 'blackmagicprobe', expected = set(('arc-nsim',
'dediprog', 'stm32flash', 'misc-flasher')) 'blackmagicprobe',
'bossac',
'dediprog',
'dfu-util',
'em-starterkit',
'esp32',
'hifive1',
'intel_s1000',
'jlink',
'misc-flasher',
'nios2',
'nrfjprog',
'openocd',
'pyocd',
'qemu',
'stm32flash',
'xtensa'))
assert runner_names == expected assert runner_names == expected