From cfbda3fd3eab23d5689399e912e9b8497e9ac7c2 Mon Sep 17 00:00:00 2001 From: Mark Whitehorn Date: Sun, 14 Apr 2019 07:44:04 -0600 Subject: [PATCH] Tools: autotest: add support for parameter file inheritance --- Tools/autotest/quadplane.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tools/autotest/quadplane.py b/Tools/autotest/quadplane.py index 17e90d4557..84665f7f64 100644 --- a/Tools/autotest/quadplane.py +++ b/Tools/autotest/quadplane.py @@ -41,7 +41,12 @@ class AutoTestQuadPlane(AutoTest): def defaults_filepath(self): vinfo = vehicleinfo.VehicleInfo() defaults_file = vinfo.options["ArduPlane"]["frames"][self.frame]["default_params_filename"] - return os.path.join(testdir, defaults_file) + if isinstance(defaults_file, str): + defaults_file = [defaults_file] + defaults_list = [] + for d in defaults_file: + defaults_list.append(os.path.join(testdir, d)) + return ','.join(defaults_list) def is_plane(self): return True