Skip to content

Commit 7486a2b

Browse files
committed
Run unittests each travis build
1 parent df634d5 commit 7486a2b

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

.travis.sh

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ elif [ $TARGET ] ; then
6363
else
6464
make -j2 $MAKEFILE
6565
fi
66+
elif [ $GOAL ] ; then
67+
make V=0 $GOAL
6668
else
6769
# No target specified, build all with very low verbosity.
6870
make V=0 all

.travis.yml

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
env:
2+
# Specify the main Mafile supported goals.
3+
- GOAL=test
4+
- GOAL=all
25
# - TARGET=CC3D
3-
# - TARGET=CJMCU
4-
# - TARGET=NAZE
5-
# - TARGET=STM32F3DISCOVERY
6-
# - TARGET=RMDO
7-
# - TARGET=SPRACINGF3
8-
# - TARGET=SPRACINGF3EVO
9-
# - TARGET=SPARKY
10-
# - TARGET=FURYF3
11-
# - TARGET=RCEXPLORERF3
12-
# - TARGET=REVO
13-
6+
147
# use new docker environment
158
sudo: false
169

@@ -28,12 +21,17 @@ addons:
2821
language: cpp
2922
compiler: clang
3023

31-
before_install: ./install-toolchain.sh
24+
before_install:
3225

3326
install:
34-
- export PATH=$PATH:$PWD/gcc-arm-none-eabi-6_2-2016q4/bin
27+
- ./install-toolchain.sh
28+
- export TOOLCHAINPATH=$PWD/gcc-arm-none-eabi-6_2-2016q4/bin
29+
30+
before_script:
31+
- $TOOLCHAINPATH/arm-none-eabi-gcc --version
32+
- clang --version
33+
- clang++ --version
3534

36-
before_script: arm-none-eabi-gcc --version
3735
script: ./.travis.sh
3836

3937
cache:

Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -743,9 +743,15 @@ VPATH := $(VPATH):$(STDPERIPH_DIR)/src
743743
#
744744

745745
# Tool names
746+
ifneq ($(TOOLCHAINPATH),)
747+
CC = $(TOOLCHAINPATH)/arm-none-eabi-gcc
748+
OBJCOPY = $(TOOLCHAINPATH)/arm-none-eabi-objcopy
749+
SIZE = $(TOOLCHAINPATH)/arm-none-eabi-size
750+
else
746751
CC = arm-none-eabi-gcc
747752
OBJCOPY = arm-none-eabi-objcopy
748753
SIZE = arm-none-eabi-size
754+
endif
749755

750756
#
751757
# Tool options.

0 commit comments

Comments
 (0)