mirror of
https://github.com/opentx/opentx.git
synced 2025-07-13 19:40:20 +03:00
Google tests didn't compile correctly on all platforms and it was not reported as an error
This commit is contained in:
parent
26a35ebcee
commit
b2878e6ea6
3 changed files with 18 additions and 18 deletions
|
@ -204,7 +204,7 @@ TEST(Lcd, Smlsize)
|
|||
lcdClear();
|
||||
lcdDrawText(0, 0, "TESTgy,", SMLSIZE);
|
||||
lcdDrawText(10, 22, "TESTgy,", SMLSIZE|INVERS);
|
||||
lcdDrawFilledRect(8, 40, 100, 20);
|
||||
lcdDrawSolidFilledRect(8, 40, 100, 20);
|
||||
lcdDrawText(10, 42, "TESTgy,", SMLSIZE);
|
||||
|
||||
bool invert = false;
|
||||
|
@ -221,7 +221,7 @@ TEST(Lcd, Stdsize)
|
|||
lcdClear();
|
||||
lcdDrawText(0, 0, "TEST", 0);
|
||||
lcdDrawText(10, 22, "TEST", INVERS);
|
||||
lcdDrawFilledRect(8, 40, 100, 20);
|
||||
lcdDrawSolidFilledRect(8, 40, 100, 20);
|
||||
lcdDrawText(10, 42, "TEST", 0);
|
||||
|
||||
bool invert = false;
|
||||
|
@ -238,7 +238,7 @@ TEST(Lcd, Midsize)
|
|||
lcdClear();
|
||||
lcdDrawText(0, 0, "TEST", MIDSIZE);
|
||||
lcdDrawText(10, 22, "TEST", MIDSIZE|INVERS);
|
||||
lcdDrawFilledRect(8, 40, 100, 20);
|
||||
lcdDrawSolidFilledRect(8, 40, 100, 20);
|
||||
lcdDrawText(10, 42, "TEST", MIDSIZE);
|
||||
|
||||
bool invert = false;
|
||||
|
@ -255,7 +255,7 @@ TEST(Lcd, Dblsize)
|
|||
lcdClear();
|
||||
lcdDrawText(2, 10, "TST", DBLSIZE);
|
||||
lcdDrawText(42, 10, "TST", DBLSIZE|INVERS);
|
||||
lcdDrawFilledRect(80, 8, 46, 24);
|
||||
lcdDrawSolidFilledRect(80, 8, 46, 24);
|
||||
lcdDrawText(82, 10, "TST", DBLSIZE);
|
||||
|
||||
bool invert = false;
|
||||
|
|
|
@ -334,7 +334,7 @@ TEST_F(TrimsTest, chainedTrims)
|
|||
EXPECT_EQ(getRawTrimValue(getTrimFlightMode(0, RUD_STICK), RUD_STICK), 32);
|
||||
}
|
||||
|
||||
TTEST_F(TrimsTest, infiniteChainedTrims)
|
||||
TEST_F(TrimsTest, infiniteChainedTrims)
|
||||
{
|
||||
setTrimValue(0, RUD_STICK, 32);
|
||||
setTrimValue(1, RUD_STICK, TRIM_EXTENDED_MAX+3); // link to FP3 trim
|
||||
|
|
|
@ -20,12 +20,12 @@ case $i in
|
|||
esac
|
||||
done
|
||||
|
||||
|
||||
if [ "$(uname)" = "Darwin" ]; then
|
||||
SCRIPT=$(python -c 'import os,sys;print(os.path.realpath(sys.argv[1]))' "$0")
|
||||
else
|
||||
SCRIPT=$(readlink -f "$0")
|
||||
fi
|
||||
|
||||
SRCDIR=$(dirname "$SCRIPT")/..
|
||||
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}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
|
@ -54,77 +54,77 @@ rm -rf *
|
|||
cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 -DTEMPLATES=YES -DHELI=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 -DTELEMETRY=MAVLINK -DHELI=YES -DTEMPLATES=YES -DAUDIO=YES -DVOICE=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=GRUVIN9X -DHELI=YES -DTEMPLATES=YES -DAUDIO=YES -DVOICE=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=SKY9X -DHELI=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=AR9X -DHELI=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X7D -DHELI=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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+
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
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} 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
|
||||
rm -rf *
|
||||
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} 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
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=HORUS -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
|
||||
make -j${CORES} firmware
|
||||
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
|
||||
rm -rf *
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue