aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest: fixed supplementary test prefix

Browse Source 
test test.CAN.CANGPSCopterMission needs to use binarues for test.CAN
This commit is contained in:
Andrew Tridgell 2023-07-17 18:45:54 +10:00
parent 7bf1a3e978
commit 30fabfa061
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Tools/autotest/autotest.py
View File

@ -399,7 +399,7 @@ tester_class_map = {
"test.CAN": arducopter.AutoTestCAN,
}
suplementary_test_binary_map = {
supplementary_test_binary_map = {
"test.CAN": ["sitl_periph_gps.AP_Periph", "sitl_periph_gps.AP_Periph.1"],
}
@ -504,24 +504,28 @@ def run_step(step):
if step.startswith("defaults"):
vehicle = step[9:]
return get_default_params(vehicle, binary)
# see if we need any supplementary binaries
supplementary_binaries = []
if step in suplementary_test_binary_map:
for supplementary_test_binary in suplementary_test_binary_map[step]:
config_name = supplementary_test_binary.split('.')[0]
binary_name = supplementary_test_binary.split('.')[1]
instance_num = 0
if len(supplementary_test_binary.split('.')) >= 3:
instance_num = int(supplementary_test_binary.split('.')[2])
supplementary_binaries.append([util.reltopdir(os.path.join('build',
config_name,
'bin',
binary_name)),
'-I {}'.format(instance_num)])
# we are running in conjunction with a supplementary app
# can't have speedup
opts.speedup = 1.0
else:
supplementary_binaries = []
for k in supplementary_test_binary_map.keys():
if step.startswith(k):
# this test needs to use supplementary binaries
for supplementary_test_binary in supplementary_test_binary_map[k]:
config_name = supplementary_test_binary.split('.')[0]
binary_name = supplementary_test_binary.split('.')[1]
instance_num = 0
if len(supplementary_test_binary.split('.')) >= 3:
instance_num = int(supplementary_test_binary.split('.')[2])
supplementary_binaries.append([util.reltopdir(os.path.join('build',
config_name,
'bin',
binary_name)),
'-I {}'.format(instance_num)])
# we are running in conjunction with a supplementary app
# can't have speedup
opts.speedup = 1.0
break
fly_opts = {
"viewerip": opts.viewerip,
"use_map": opts.map,

2
Tools/autotest/common.py
View File

@ -8089,7 +8089,7 @@ Also, ignores heartbeats not from our target system'''
if self.mav is not None:
self.mav.reconnect()
def get_suplementary_programs(self):
def get_supplementary_programs(self):
return self.sup_prog
def stop_sup_program(self, instance=None):