From abeed36333cd5939134f1b5f40855feaf499078e Mon Sep 17 00:00:00 2001 From: tkl Date: Tue, 26 Jul 2016 22:35:17 +0200 Subject: [PATCH 1/2] cppcheck fixed --- .cproject | 43 +++------------------------------------- config/make/rules.mk | 5 +++-- config/make/stm32f4xx.mk | 14 ++++++++++++- 3 files changed, 19 insertions(+), 43 deletions(-) diff --git a/.cproject b/.cproject index b0563cb..bb1c660 100755 --- a/.cproject +++ b/.cproject @@ -267,7 +267,6 @@ make - all true true @@ -275,7 +274,6 @@ make - clean true true @@ -283,7 +281,6 @@ make - all true true @@ -291,7 +288,6 @@ make - all true true @@ -299,7 +295,6 @@ make - clean true true @@ -307,36 +302,11 @@ make - distclean true false true - - make - APP=example_semaphore BOARD=stm32f4-discovery DEBUG=y - all - true - false - true - - - make - APP=example_semaphore BOARD=stm32f4-discovery DEBUG=y - clean - true - false - true - - - make - APP=example_semaphore BOARD=stm32f4-discovery DEBUG=y - install - true - false - true - make APP=test BOARD=stm32f4-discovery DEBUG=y @@ -353,24 +323,17 @@ false true - + make APP=test BOARD=stm32f4-discovery DEBUG=y - check - true - false - true - - - make - APP=test BOARD=stm32f4-discovery DEBUG=y - build + clean true false true make + distclean true false diff --git a/config/make/rules.mk b/config/make/rules.mk index 501d1dc..c0a4fa4 100755 --- a/config/make/rules.mk +++ b/config/make/rules.mk @@ -15,11 +15,12 @@ CFLAGS += \ $(addprefix -I, $(INCLUDES)) \ -Wall -CPPCHECK_FLAGS = \ +CPPCHECK_FLAGS += \ --template=gcc \ --error-exitcode=1 \ --enable=warning,performance,information,style \ - --inline-suppr + --inline-suppr \ + $(addprefix -I, $(INCLUDES)) include $(ROOT_DIR)/config/make/tools.mk diff --git a/config/make/stm32f4xx.mk b/config/make/stm32f4xx.mk index 71a2ad2..d6e8823 100644 --- a/config/make/stm32f4xx.mk +++ b/config/make/stm32f4xx.mk @@ -7,7 +7,9 @@ CFLAGS += -DBOARD_STM32F4_DISCOVERY endif CROSS_COMPILE=arm-none-eabi- -INCLUDES := /usr/lib/arm-none-eabi/include +INCLUDES += \ + /usr/lib/arm-none-eabi/include \ + /usr/lib/gcc/arm-none-eabi/4.8/include ifeq ($(DEBUG),y) OPTIM = 0 @@ -33,6 +35,16 @@ CFLAGS += \ -ffunction-sections # -D inline= -mthumb\ +CPPCHECK_FLAGS += \ + -D USE_STDPERIPH_DRIVER\ + -D VECT_TAB_FLASH\ + -D GCC_ARMCM4\ + -D THUMB_INTERWORK\ + -D PACK_STRUCT_END=__attribute\(\(packed\)\)\ + -D ALIGN_STRUCT_END=__attribute\(\(aligned\(4\)\)\)\ + -D __thumb__ \ + --check-config + LDFLAGS=\ -Wl,--gc-sections \ -Xlinker -M > $(MAP_DIR)/$(APP).map From e4ec7adce6483076a80146730048c55598fc8192 Mon Sep 17 00:00:00 2001 From: tkl Date: Tue, 26 Jul 2016 22:35:44 +0200 Subject: [PATCH 2/2] ci build jobs changed --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46e8959..7e9bfd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,14 +17,13 @@ before_script: stages: - check - build -# - test + - test # - deploy build_job: script: - "cd source" - "make build APP=test BOARD=stm32f4-discovery" - - "make build APP=example_semaphore BOARD=stm32f4-discovery" stage: build except: - /^release/.*$/ @@ -33,12 +32,13 @@ check_job: script: - "cd source" - "make check APP=test BOARD=stm32f4-discovery" - - "make check APP=example_semaphore BOARD=stm32f4-discovery" stage: check -#test_job: -# script: "echo test stage" -# stage: test +test_job: + script: + - "cd source" + - "make install APP=test BOARD=stm32f4-discovery" + stage: test #int_release_job: # script: