Browse Source

Tools: build_autotest.sh: install pymavlink after MAVProxy

Currently installing MAVProxy pulls pymavlink in as a dependency, so we
end up running whatever MAVProxy's master branch is pointing to
(currently pymavlink>=2.3.3).

ardupilot master can reference a pymavlink commit which is not part of
whatever MAVProxy's master branch is pointing to, so we end up with
failures like this in autotest:

  fly.ArduCopter:
    Mount (Test Camera/Antenna Mount) ('module' object has no attribute 'MAV_CMD_DO_SET_ROI_SYSID') (see /mnt/volume_nyc3_01/autotest/APM/buildlogs/ArduCopter-Mount.txt)
    FixedYawCalibration (Test Fixed Yaw Calibration) ('module' object has no attribute 'MAV_CMD_FIXED_MAG_CAL_YAW') (see /mnt/volume_nyc3_01/autotest/APM/buildlogs/ArduCopter-FixedYawCalibration.txt)

If we install pymavlink after installing MAVProxy we should end up with
the pymavlink messages generated from the messages in our mavlink
subdirectory, rather that the pymavlink messages shipped as part of the
pymavlink pip release.
c415-sdk
Peter Barker 5 years ago committed by Peter Barker
parent
commit
49314b2b86
  1. 12
      Tools/scripts/build_autotest.sh

12
Tools/scripts/build_autotest.sh

@ -89,12 +89,6 @@ popd
rsync -a APM/Tools/autotest/web-firmware/ buildlogs/binaries/ rsync -a APM/Tools/autotest/web-firmware/ buildlogs/binaries/
echo "Updating pymavlink"
pushd APM/modules/mavlink/pymavlink
git show
python setup.py build install --user
popd
echo "Updating MAVProxy" echo "Updating MAVProxy"
pushd MAVProxy pushd MAVProxy
git fetch origin git fetch origin
@ -103,6 +97,12 @@ git show
python setup.py build install --user python setup.py build install --user
popd popd
echo "Updating pymavlink"
pushd APM/modules/mavlink/pymavlink
git show
python setup.py build install --user
popd
githash=$(cd APM && git rev-parse HEAD) githash=$(cd APM && git rev-parse HEAD)
hdate=$(date +"%Y-%m-%d-%H:%m") hdate=$(date +"%Y-%m-%d-%H:%m")

Loading…
Cancel
Save