From 8c8c910ad050866dfa7b57eb78662b5cd8fd3944 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 5 May 2015 10:39:13 +1000 Subject: [PATCH] autotest: removed the old AVR/2560 code in autotest now checked with build_all --- Tools/autotest/autotest.py | 8 -------- Tools/autotest/pysim/util.py | 14 -------------- 2 files changed, 22 deletions(-) diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py index 8826087195..1bd3c84338 100755 --- a/Tools/autotest/autotest.py +++ b/Tools/autotest/autotest.py @@ -157,12 +157,10 @@ steps = [ 'build.Examples', 'build.Parameters', - 'build2560.ArduPlane', 'build.ArduPlane', 'defaults.ArduPlane', 'fly.ArduPlane', - 'build2560.APMrover2', 'build.APMrover2', 'defaults.APMrover2', 'drive.APMrover2', @@ -211,12 +209,6 @@ def run_step(step): if step == 'build.ArduCopter': return util.build_SIL('ArduCopter') - if step == 'build2560.ArduPlane': - return util.build_AVR('ArduPlane', board='mega2560') - - if step == 'build2560.APMrover2': - return util.build_AVR('APMrover2', board='mega2560') - if step == 'defaults.ArduPlane': return get_default_params('ArduPlane') diff --git a/Tools/autotest/pysim/util.py b/Tools/autotest/pysim/util.py index 3fa616ce78..8ba3bfdf68 100644 --- a/Tools/autotest/pysim/util.py +++ b/Tools/autotest/pysim/util.py @@ -68,20 +68,6 @@ def build_SIL(atype, target='sitl'): checkfail=True) return True -def build_AVR(atype, board='mega2560'): - '''build AVR binaries''' - config = open(reltopdir('config.mk'), mode='w') - config.write(''' -HAL_BOARD=HAL_BOARD_APM1 -BOARD=%s -PORT=/dev/null -''' % board) - config.close() - run_cmd("make clean", dir=reltopdir(atype), checkfail=True) - run_cmd("make", dir=reltopdir(atype), checkfail=True) - return True - - # list of pexpect children to close on exit close_list = []