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

Google tests didn't compile correctly on all platforms and it was not reported as an error

Browse source
This commit is contained in:
Bertrand Songis 2016-11-14 18:08:56 +01:00
parent 26a35ebcee
commit b2878e6ea6
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/tests/lcd.cpp
View file

@ -204,7 +204,7 @@ TEST(Lcd, Smlsize)
lcdClear(); lcdClear();
lcdDrawText(0, 0, "TESTgy,", SMLSIZE); lcdDrawText(0, 0, "TESTgy,", SMLSIZE);
lcdDrawText(10, 22, "TESTgy,", SMLSIZE|INVERS); lcdDrawText(10, 22, "TESTgy,", SMLSIZE|INVERS);
lcdDrawFilledRect(8, 40, 100, 20); lcdDrawSolidFilledRect(8, 40, 100, 20);
lcdDrawText(10, 42, "TESTgy,", SMLSIZE); lcdDrawText(10, 42, "TESTgy,", SMLSIZE);
bool invert = false; bool invert = false;
@ -221,7 +221,7 @@ TEST(Lcd, Stdsize)
lcdClear(); lcdClear();
lcdDrawText(0, 0, "TEST", 0); lcdDrawText(0, 0, "TEST", 0);
lcdDrawText(10, 22, "TEST", INVERS); lcdDrawText(10, 22, "TEST", INVERS);
lcdDrawFilledRect(8, 40, 100, 20); lcdDrawSolidFilledRect(8, 40, 100, 20);
lcdDrawText(10, 42, "TEST", 0); lcdDrawText(10, 42, "TEST", 0);
bool invert = false; bool invert = false;
@ -238,7 +238,7 @@ TEST(Lcd, Midsize)
lcdClear(); lcdClear();
lcdDrawText(0, 0, "TEST", MIDSIZE); lcdDrawText(0, 0, "TEST", MIDSIZE);
lcdDrawText(10, 22, "TEST", MIDSIZE|INVERS); lcdDrawText(10, 22, "TEST", MIDSIZE|INVERS);
lcdDrawFilledRect(8, 40, 100, 20); lcdDrawSolidFilledRect(8, 40, 100, 20);
lcdDrawText(10, 42, "TEST", MIDSIZE); lcdDrawText(10, 42, "TEST", MIDSIZE);
bool invert = false; bool invert = false;
@ -255,7 +255,7 @@ TEST(Lcd, Dblsize)
lcdClear(); lcdClear();
lcdDrawText(2, 10, "TST", DBLSIZE); lcdDrawText(2, 10, "TST", DBLSIZE);
lcdDrawText(42, 10, "TST", DBLSIZE|INVERS); lcdDrawText(42, 10, "TST", DBLSIZE|INVERS);
lcdDrawFilledRect(80, 8, 46, 24); lcdDrawSolidFilledRect(80, 8, 46, 24);
lcdDrawText(82, 10, "TST", DBLSIZE); lcdDrawText(82, 10, "TST", DBLSIZE);
bool invert = false; bool invert = false;

2
radio/src/tests/mixer.cpp
View file

@ -334,7 +334,7 @@ TEST_F(TrimsTest, chainedTrims)
EXPECT_EQ(getRawTrimValue(getTrimFlightMode(0, RUD_STICK), RUD_STICK), 32); EXPECT_EQ(getRawTrimValue(getTrimFlightMode(0, RUD_STICK), RUD_STICK), 32);
} }
TTEST_F(TrimsTest, infiniteChainedTrims) TEST_F(TrimsTest, infiniteChainedTrims)
{ {
setTrimValue(0, RUD_STICK, 32); setTrimValue(0, RUD_STICK, 32);
setTrimValue(1, RUD_STICK, TRIM_EXTENDED_MAX+3); // link to FP3 trim setTrimValue(1, RUD_STICK, TRIM_EXTENDED_MAX+3); // link to FP3 trim

26
tools/commit-tests.sh
View file

@ -20,12 +20,12 @@ case $i in
esac esac
done done
if [ "$(uname)" = "Darwin" ]; then if [ "$(uname)" = "Darwin" ]; then
SCRIPT=$(python -c 'import os,sys;print(os.path.realpath(sys.argv[1]))' "$0") SCRIPT=$(python -c 'import os,sys;print(os.path.realpath(sys.argv[1]))' "$0")
else else
SCRIPT=$(readlink -f "$0") SCRIPT=$(readlink -f "$0")
fi fi
SRCDIR=$(dirname "$SCRIPT")/.. SRCDIR=$(dirname "$SCRIPT")/..
COMMON_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/opt/qt55" COMMON_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/opt/qt55"
@ -37,7 +37,7 @@ rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=9X -DHELI=YES -DTEMPLATES=YES -DTELEMETRY=FRSKY ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=9X -DHELI=YES -DTEMPLATES=YES -DTELEMETRY=FRSKY ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on 9X stock with Ardupilot telemetry # OpenTX on 9X stock with Ardupilot telemetry
rm -rf * rm -rf *
@ -54,77 +54,77 @@ rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 -DTEMPLATES=YES -DHELI=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 -DTEMPLATES=YES -DHELI=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on Mega2560 with Mavlink telemetry # OpenTX on Mega2560 with Mavlink telemetry
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 -DTELEMETRY=MAVLINK -DHELI=YES -DTEMPLATES=YES -DAUDIO=YES -DVOICE=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 -DTELEMETRY=MAVLINK -DHELI=YES -DTEMPLATES=YES -DAUDIO=YES -DVOICE=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on gruvin9x board # OpenTX on gruvin9x board
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=GRUVIN9X -DHELI=YES -DTEMPLATES=YES -DAUDIO=YES -DVOICE=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=GRUVIN9X -DHELI=YES -DTEMPLATES=YES -DAUDIO=YES -DVOICE=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on Sky9x # OpenTX on Sky9x
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=SKY9X -DHELI=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=SKY9X -DHELI=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on AR9X # OpenTX on AR9X
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=AR9X -DHELI=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=AR9X -DHELI=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on X7D # OpenTX on X7D
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X7D -DHELI=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=X7D -DHELI=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on X9D # OpenTX on X9D
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on X9D+ # OpenTX on X9D+
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on Taranis X9E # OpenTX on Taranis X9E
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X9E -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES -DPPM_UNIT=PERCENT_PREC1 ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=X9E -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES -DPPM_UNIT=PERCENT_PREC1 ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on Horus beta boards # OpenTX on Horus beta boards
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=HORUS -DPCBREV=10 -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=HORUS -DPCBREV=10 -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# OpenTX on Horus # OpenTX on Horus
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=HORUS -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=HORUS -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
make -j${CORES} firmware make -j${CORES} firmware
make -j${CORES} simu make -j${CORES} simu
make -j${CORES} gtests && ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure make -j${CORES} gtests ; ./gtests --gtest_shuffle --gtest_repeat=5 --gtest_break_on_failure
# Companion # Companion
rm -rf * rm -rf *