Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotest: cope with symlinks in vehicle path

This commit is contained in:
Andrew Tridgell 2015-08-13 12:02:45 +10:00
parent 596cac58d0
commit 730b5d228e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Tools/autotest/sim_vehicle.sh
View File

@ -188,7 +188,12 @@ SIMOUT_PORT="127.0.0.1:"$((5501+10*$INSTANCE))
FG_PORT="127.0.0.1:"$((5503+10*$INSTANCE))
[ -z "$VEHICLE" ] && {
VEHICLE=$(basename $PWD)
CDIR="$PWD"
rpath=$(which realpath)
[ -n "rpath" ] && {
CDIR=$(realpath $CDIR)
}
VEHICLE=$(basename $CDIR)
}
[ -z "$FRAME" -a "$VEHICLE" = "APMrover2" ] && {
@ -287,8 +292,12 @@ autotest="../Tools/autotest"
# the location of the sim_vehicle.sh script to find the path
autotest=$(dirname $(readlink -e $0))
}
pushd $autotest/../../$VEHICLE || {
echo "Failed to change to vehicle directory for $VEHICLE"
VEHICLEDIR="$autotest/../../$VEHICLE"
[ -d "$VEHICLEDIR" ] || {
VEHICLEDIR=$(dirname $(readlink -e $VEHICLEDIR))
}
pushd $VEHICLEDIR || {
echo "Failed to change to vehicle directory for $VEHICLEDIR"
usage
exit 1
}