Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 09:58:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

autotest: fixed checkout bug in build_binaries.sh

Browse Source
This commit is contained in:
Andrew Tridgell 2017-01-09 22:02:24 +11:00
parent cc5e9da6ef
commit 90516f1064
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Tools/scripts/build_binaries.sh
View File

@ -59,20 +59,20 @@ waf() {
# checkout the right version of the tree # checkout the right version of the tree
checkout() { checkout() {
vehicle="$1" vehicle="$1"
tag="$2" ctag="$2"
board="$3" cboard="$3"
frame="$4" cframe="$4"
echo "Trying checkout $vehicle $tag $board $frame" echo "Trying checkout $vehicle $ctag $cboard $cframe"
git stash git stash
if [ "$tag" = "latest" ]; then if [ "$ctag" = "latest" ]; then
vtag="master" vtag="master"
else else
vtag="$vehicle-$tag" vtag="$vehicle-$ctag"
fi fi
# try frame specific tag # try frame specific tag
if [ -n "$frame" ]; then if [ -n "$cframe" ]; then
vtag2="$vtag-$frame" vtag2="$vtag-$cframe"
git checkout -f "$vtag2" && { git checkout -f "$vtag2" && {
echo "Using frame specific tag $vtag2" echo "Using frame specific tag $vtag2"
@ -83,7 +83,7 @@ checkout() {
fi fi
# try board type specific branch extension # try board type specific branch extension
vtag2="$vtag"$(board_branch $board) vtag2="$vtag"$(board_branch $cboard)
git checkout -f "$vtag2" && { git checkout -f "$vtag2" && {
echo "Using board specific tag $vtag2" echo "Using board specific tag $vtag2"
@ -99,7 +99,7 @@ checkout() {
return 0 return 0
} }
echo "Failed to find tag for $vehicle $tag $board $frame" echo "Failed to find tag for $vehicle $ctag $cboard $cframe"
return 1 return 1
} }
@ -126,10 +126,10 @@ skip_board_waf() {
} }
skip_frame() { skip_frame() {
board=$1 sboard=$1
frame=$2 sframe=$2
if [ "$board" = "bebop" ]; then if [ "$sboard" = "bebop" ]; then
if [ "$frame" != "quad" ]; then if [ "$sframe" != "quad" ]; then
return 0 return 0
fi fi
fi fi