Merge pull request #2907 from opentx/bsongis/commit_tests_moved_to_travis
Commit tests moved to Travis
This commit is contained in:
+3
-1
@@ -3,10 +3,12 @@ language: cpp
|
|||||||
before_install:
|
before_install:
|
||||||
- sudo apt-get remove cmake cmake-data --yes
|
- sudo apt-get remove cmake cmake-data --yes
|
||||||
- sudo add-apt-repository ppa:george-edison55/precise-backports --yes
|
- sudo add-apt-repository ppa:george-edison55/precise-backports --yes
|
||||||
|
- sudo add-apt-repository ppa:terry.guo/gcc-arm-embedded --yes
|
||||||
- sudo apt-get update
|
- sudo apt-get update
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- sudo apt-get install -y lcov cmake cmake-data curl gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev
|
- sudo apt-get install -y lcov cmake cmake-data bc curl gcc-arm-none-eabi gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
- radio/util/commit-tests.sh
|
||||||
- mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug ../companion/src && cmake --build .
|
- mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug ../companion/src && cmake --build .
|
||||||
+8
-8
@@ -1828,15 +1828,16 @@ endif
|
|||||||
|
|
||||||
#### GOOGLE TESTS
|
#### GOOGLE TESTS
|
||||||
|
|
||||||
GTEST_DIR = ../gtest-1.6.0
|
GTEST_INCDIR = /usr/include/gtest
|
||||||
|
GTEST_SRCDIR = /usr/src/gtest/
|
||||||
|
|
||||||
# Where to find user code.
|
# Where to find user code.
|
||||||
USER_DIR = ./
|
USER_DIR = ./
|
||||||
|
|
||||||
# All Google Test headers. Usually you shouldn't change this
|
# All Google Test headers. Usually you shouldn't change this
|
||||||
# definition.
|
# definition.
|
||||||
GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
|
GTEST_HEADERS = $(GTEST_INCDIR)/*.h \
|
||||||
$(GTEST_DIR)/include/gtest/internal/*.h
|
$(GTEST_INCDIR)/internal/*.h
|
||||||
|
|
||||||
# House-keeping build targets.
|
# House-keeping build targets.
|
||||||
|
|
||||||
@@ -1844,15 +1845,14 @@ GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
|
|||||||
|
|
||||||
# Usually you shouldn't tweak such internal variables, indicated by a
|
# Usually you shouldn't tweak such internal variables, indicated by a
|
||||||
# trailing _.
|
# trailing _.
|
||||||
GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
|
GTEST_SRCS = $(GTEST_SRCDIR)/src/*.cc $(GTEST_HEADERS)
|
||||||
|
|
||||||
# For simplicity and to avoid depending on Google Test's
|
# For simplicity and to avoid depending on Google Test's
|
||||||
# implementation details, the dependencies specified below are
|
# implementation details, the dependencies specified below are
|
||||||
# conservative and not optimized. This is fine as Google Test
|
# conservative and not optimized. This is fine as Google Test
|
||||||
# compiles fast and for ordinary users its source rarely changes.
|
# compiles fast and for ordinary users its source rarely changes.
|
||||||
gtest-all.o : $(GTEST_SRCS_)
|
gtest-all.o : $(GTEST_SRCS)
|
||||||
$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) -I$(GTEST_DIR)/include -c \
|
$(CXX) $(CPPFLAGS) -I$(GTEST_SRCDIR) -I$(GTEST_INCDIR) -c $(GTEST_SRCDIR)/src/gtest-all.cc
|
||||||
$(GTEST_DIR)/src/gtest-all.cc
|
|
||||||
|
|
||||||
# Builds a sample test. A test should link with either gtest.a or
|
# Builds a sample test. A test should link with either gtest.a or
|
||||||
# gtest_main.a, depending on whether it defines its own main()
|
# gtest_main.a, depending on whether it defines its own main()
|
||||||
@@ -1862,5 +1862,5 @@ gtest-all.o : $(GTEST_SRCS_)
|
|||||||
GTEST_TESTS_SRCS = $(shell find tests/ -type f -name '*.cpp')
|
GTEST_TESTS_SRCS = $(shell find tests/ -type f -name '*.cpp')
|
||||||
|
|
||||||
gtests: allsimusrc.cpp $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp *.h tests/gtests.h gtest-all.o
|
gtests: allsimusrc.cpp $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp *.h tests/gtests.h gtest-all.o
|
||||||
g++ -std=gnu++0x $(CPPFLAGS) $(SIMUCPPFLAGS) allsimusrc.cpp $(LUASRC) $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp -I$(GTEST_DIR) ${INCFLAGS} -I$(GTEST_DIR)/include -I/usr/include/qt4 -o gtests -lpthread -MD -DSIMU -lQtCore -lQtGui gtest-all.o -fexceptions
|
g++ -std=gnu++0x $(CPPFLAGS) $(SIMUCPPFLAGS) allsimusrc.cpp $(LUASRC) $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp ${INCFLAGS} -I$(GTEST_INCDIR) -I/usr/include/qt4 -o gtests -lpthread -MD -DSIMU -lQtCore -lQtGui gtest-all.o -fexceptions
|
||||||
|
|
||||||
|
|||||||
@@ -24,11 +24,11 @@ void doMixerCalculations();
|
|||||||
|
|
||||||
inline void SYSTEM_RESET()
|
inline void SYSTEM_RESET()
|
||||||
{
|
{
|
||||||
g_eeGeneral.currModel = 0;
|
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
memset(modelHeaders, 0, sizeof(modelHeaders));
|
memset(modelHeaders, 0, sizeof(modelHeaders));
|
||||||
#endif
|
#endif
|
||||||
generalDefault();
|
generalDefault();
|
||||||
|
g_eeGeneral.templateSetup = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void MODEL_RESET()
|
inline void MODEL_RESET()
|
||||||
|
|||||||
@@ -62,6 +62,7 @@
|
|||||||
|
|
||||||
TEST(Trims, throttleTrim)
|
TEST(Trims, throttleTrim)
|
||||||
{
|
{
|
||||||
|
SYSTEM_RESET();
|
||||||
MODEL_RESET();
|
MODEL_RESET();
|
||||||
modelDefault(0);
|
modelDefault(0);
|
||||||
g_model.thrTrim = 1;
|
g_model.thrTrim = 1;
|
||||||
|
|||||||
@@ -370,16 +370,12 @@ TEST(evalLogicalSwitches, playFile)
|
|||||||
sdAvailableLogicalSwitchAudioFiles = 0xffffffffffffffff;
|
sdAvailableLogicalSwitchAudioFiles = 0xffffffffffffffff;
|
||||||
char filename[AUDIO_FILENAME_MAXLEN+1];
|
char filename[AUDIO_FILENAME_MAXLEN+1];
|
||||||
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (0 << 16) + AUDIO_EVENT_OFF, filename);
|
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (0 << 16) + AUDIO_EVENT_OFF, filename);
|
||||||
TRACE(filename);
|
|
||||||
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/MODEL01/L1-off.wav"), 0);
|
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/MODEL01/L1-off.wav"), 0);
|
||||||
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (0 << 16) + AUDIO_EVENT_ON, filename);
|
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (0 << 16) + AUDIO_EVENT_ON, filename);
|
||||||
TRACE(filename);
|
|
||||||
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/MODEL01/L1-on.wav"), 0);
|
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/MODEL01/L1-on.wav"), 0);
|
||||||
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (31 << 16) + AUDIO_EVENT_OFF, filename);
|
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (31 << 16) + AUDIO_EVENT_OFF, filename);
|
||||||
TRACE(filename);
|
|
||||||
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/MODEL01/L32-off.wav"), 0);
|
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/MODEL01/L32-off.wav"), 0);
|
||||||
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (31 << 16) + AUDIO_EVENT_ON, filename);
|
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (31 << 16) + AUDIO_EVENT_ON, filename);
|
||||||
TRACE(filename);
|
|
||||||
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/MODEL01/L32-on.wav"), 0);
|
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/MODEL01/L32-on.wav"), 0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -50,7 +50,3 @@ make simu PCB=GRUVIN9X EXT=FRSKY SDCARD=YES
|
|||||||
make clean
|
make clean
|
||||||
make PCB=MEGA2560
|
make PCB=MEGA2560
|
||||||
|
|
||||||
# Companion
|
|
||||||
cd ../../buildir/
|
|
||||||
cmake ../companion/src
|
|
||||||
make
|
|
||||||
Reference in New Issue
Block a user