From 3b143a99bf639c8064b526347e80f486271fdc6e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 4 May 2018 14:07:41 +1000 Subject: [PATCH] autotest: removed sitl-debug varient --- Tools/autotest/autotest.py | 5 +---- Tools/autotest/sim_vehicle.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py index 632c876926..cdaf7152b5 100755 --- a/Tools/autotest/autotest.py +++ b/Tools/autotest/autotest.py @@ -203,10 +203,7 @@ def binary_path(step, debug=False): # cope with builds that don't have a specific binary return None - if debug: - binary_basedir = "sitl-debug" - else: - binary_basedir = "sitl" + binary_basedir = "sitl" binary = util.reltopdir(os.path.join('build', binary_basedir, 'bin', binary_name)) if not os.path.exists(binary): diff --git a/Tools/autotest/sim_vehicle.py b/Tools/autotest/sim_vehicle.py index f2ad3bf019..613e447c49 100755 --- a/Tools/autotest/sim_vehicle.py +++ b/Tools/autotest/sim_vehicle.py @@ -998,10 +998,7 @@ else: do_build_parameters(cmd_opts.vehicle) if cmd_opts.build_system == "waf": - if cmd_opts.debug: - binary_basedir = "build/sitl-debug" - else: - binary_basedir = "build/sitl" + binary_basedir = "build/sitl" vehicle_binary = os.path.join(find_root_dir(), binary_basedir, frame_infos["waf_target"])