From 87d363c3f492c306b346ba38cc110662c96c0398 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 27 Mar 2020 13:46:12 +1100
Subject: [PATCH] Tools: use renamed autotest step names

---
 Tools/autotest/build-with-disabled-features.py | 10 +++++-----
 Tools/scripts/run-coverage.sh                  | 12 ++++++------
 Vagrantfile                                    |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Tools/autotest/build-with-disabled-features.py b/Tools/autotest/build-with-disabled-features.py
index 5635bc5734..ee8372ed45 100755
--- a/Tools/autotest/build-with-disabled-features.py
+++ b/Tools/autotest/build-with-disabled-features.py
@@ -200,7 +200,7 @@ class BuilderCopter(Builder):
 specs = [
     {
         "config": 'ArduCopter/config.h',
-        "autotest_target": "build.ArduCopter",
+        "autotest_target": "build.Copter",
         "target_binary": "bin/arducopter",
         "reverse-deps": {
             "AC_FENCE": ["AC_AVOID_ENABLED", "MODE_FOLLOW_ENABLED"],
@@ -243,19 +243,19 @@ specs = [
     },
     {
         "config": 'ArduPlane/config.h',
-        "autotest_target": "build.ArduPlane",
+        "autotest_target": "build.Plane",
         "target_binary": "bin/arduplane",
         "reverse-deps": {
         },
     }, {
         "config": 'APMrover2/config.h',
-        "autotest_target": "build.APMrover2",
+        "autotest_target": "build.Rover",
         "target_binary": "bin/ardurover",
         "reverse-deps": {
         },
     }, {
         "config": 'ArduSub/config.h',
-        "autotest_target": "build.ArduSub",
+        "autotest_target": "build.Sub",
         "target_binary": "bin/ardusub",
         "reverse-deps": {
             "AC_FENCE": ["AVOIDANCE_ENABLED"],
@@ -264,7 +264,7 @@ specs = [
         },
     }, {
         "config": 'AntennaTracker/config.h',
-        "autotest_target": "build.AntennaTracker",
+        "autotest_target": "build.Tracker",
         "target_binary": "bin/antennatracker",
         "reverse-deps": {
         },
diff --git a/Tools/scripts/run-coverage.sh b/Tools/scripts/run-coverage.sh
index 0f2bbea113..5d76e43626 100755
--- a/Tools/scripts/run-coverage.sh
+++ b/Tools/scripts/run-coverage.sh
@@ -29,12 +29,12 @@ rm -rf build
 ./Tools/autotest/autotest.py $OPTS build.unit_tests run.unit_tests
 
 # Run main vehicle tests
-./Tools/autotest/autotest.py $OPTS build.ArduPlane fly.ArduPlane fly.QuadPlane
-./Tools/autotest/autotest.py $OPTS build.ArduSub dive.ArduSub
-./Tools/autotest/autotest.py $OPTS build.ArduCopter fly.ArduCopter fly.ArduCopter
-./Tools/autotest/autotest.py $OPTS build.Helicopter fly.CopterAVC
-./Tools/autotest/autotest.py $OPTS build.AntennaTracker test.AntennaTracker
-./Tools/autotest/autotest.py $OPTS build.APMrover2 drive.APMrover2
+./Tools/autotest/autotest.py $OPTS build.Plane test.Plane test.QuadPlane
+./Tools/autotest/autotest.py $OPTS build.Sub test.Sub
+./Tools/autotest/autotest.py $OPTS build.Copter test.Copter
+./Tools/autotest/autotest.py $OPTS build.Helicopter test.Helicopter
+./Tools/autotest/autotest.py $OPTS build.Tracker test.Tracker
+./Tools/autotest/autotest.py $OPTS build.Rover test.Rover
 
 #TODO add any other execution path/s we can to maximise the actually
 # used code, can we run other tests or things?  Replay, perhaps?
diff --git a/Vagrantfile b/Vagrantfile
index 33457b1042..de043d5076 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,7 +9,7 @@
 # time (cd /vagrant && ./waf configure --board=fmuv3 && ./waf build --target=bin/ardusub) # ~ minutes (after building fmuv2)
 # time (cd /vagrant && ./waf configure --board=navio2 && ./waf build --target=bin/arduplane)
 # time (cd /vagrant && ./Tools/autotest/sim_vehicle.py --map --console -v ArduPlane -f jsbsim) # should test JSBSim
-# time (cd /vagrant && ./Tools/autotest/autotest.py build.APMrover2 drive.APMrover2)
+# time (cd /vagrant && ./Tools/autotest/autotest.py build.Rover test.Rover)
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"