autotest: build each set of px4 binaries separately

This commit is contained in:
Andrew Tridgell 2016-09-05 12:43:52 +10:00
parent 4c22c59933
commit d529b5e3b8
1 changed files with 4 additions and 4 deletions

View File

@ -249,7 +249,7 @@ build_arduplane() {
} }
skip_build $tag $ddir || { skip_build $tag $ddir || {
make px4-clean make px4-clean
make px4 -j2 || { (make px4-v1 -j2 && make px4-v2 -j2 && make px4-v4 -j2) || {
echo "Failed build of ArduPlane PX4 $tag" echo "Failed build of ArduPlane PX4 $tag"
error_count=$((error_count+1)) error_count=$((error_count+1))
checkout ArduPlane "latest" "" "" checkout ArduPlane "latest" "" ""
@ -310,7 +310,7 @@ build_arducopter() {
ddir="$binaries/Copter/$hdate/PX4-$f" ddir="$binaries/Copter/$hdate/PX4-$f"
skip_build $tag $ddir && continue skip_build $tag $ddir && continue
make px4-clean make px4-clean
make px4-$f -j2 || { (make px4-v1-$f -j2 && make px4-v2-$f -j2 && make px4-v4-$f -j2) || {
echo "Failed build of ArduCopter PX4 $tag" echo "Failed build of ArduCopter PX4 $tag"
error_count=$((error_count+1)) error_count=$((error_count+1))
continue continue
@ -369,7 +369,7 @@ build_rover() {
} }
skip_build $tag $ddir || { skip_build $tag $ddir || {
make px4-clean make px4-clean
make px4 -j2 || { (make px4-v1 -j2 && make px4-v2 -j2 && make px4-v4 -j2) || {
echo "Failed build of APMrover2 PX4 $tag" echo "Failed build of APMrover2 PX4 $tag"
error_count=$((error_count+1)) error_count=$((error_count+1))
checkout APMrover2 "latest" "" "" checkout APMrover2 "latest" "" ""
@ -433,7 +433,7 @@ build_antennatracker() {
} }
skip_build $tag $ddir || { skip_build $tag $ddir || {
make px4-clean make px4-clean
make px4 -j2 || { (make px4-v1 -j2 && make px4-v2 -j2 && make px4-v4 -j2) || {
echo "Failed build of AntennaTracker PX4 $tag" echo "Failed build of AntennaTracker PX4 $tag"
error_count=$((error_count+1)) error_count=$((error_count+1))
checkout AntennaTracker "latest" "" "" checkout AntennaTracker "latest" "" ""