Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 16:55:20 +03:00
Code Issues Wiki Activity

Fix nightlies compilation and add multi to Travis (it is mainstream after all)

Browse source
This commit is contained in:
3djc 2019-06-06 15:47:27 +02:00
parent 611b39f6df
commit 1203557739
2 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/commit-tests.sh
View file

@ -47,7 +47,7 @@ fi
: ${SRCDIR:=$(dirname "$SCRIPT")/..}
: ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=Debug -DTRACE_SIMPGMSPACE=NO -DVERBOSE_CMAKELISTS=YES -DCMAKE_RULE_MESSAGES=OFF -Wno-dev"}
if (( $WERROR )); then COMMON_OPTIONS+=" -DWARNINGS_AS_ERRORS=YES"; fi
if (( $WERROR )); then COMMON_OPTIONS+=" -DWARNINGS_AS_ERRORS=YES -DMULTIMODULE=YES"; fi
: ${EXTRA_OPTIONS:="$EXTRA_OPTIONS"}
@ -63,7 +63,7 @@ cd build
if [[ " SKY9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
# OpenTX on Sky9x
rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=SKY9X -DHELI=YES DLUA=YES -DMULTIMODULE=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES -DGVARS=YES ${SRCDIR}
cmake ${COMMON_OPTIONS} -DPCB=SKY9X -DHELI=YES DLUA=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} gtests ; ./gtests ${TEST_OPTIONS}
@ -159,15 +159,6 @@ if [[ " X10 HORUS ALL " =~ " ${FLAVOR} " ]] ; then
make -j${CORES} gtests ; ./gtests ${TEST_OPTIONS}
fi
if [[ " X12Sr10 HORUS ALL " =~ " ${FLAVOR} " ]] ; then
# OpenTX on Horus beta boards
rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X12S -DPCBREV=10 -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} gtests ; ./gtests ${TEST_OPTIONS}
fi
if [[ " X12S HORUS ALL " =~ " ${FLAVOR} " ]] ; then
# OpenTX on Horus
rm -rf *