riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4399 from OlegHahm/travis_cm4_groups

Browse Source 
CI: split up Cortex-M4 in two groups
This commit is contained in:
Cenk Gündoğan 2015-12-03 19:45:42 +01:00
commit 6c8d63bcac
16 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.strider.yml
View File

@ -7,7 +7,8 @@ os:
env: env:
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests - NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4 - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_2
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_1
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0 - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86 - NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2 - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2

3
.travis.yml
View File

@ -4,7 +4,8 @@ cache: apt
env: env:
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests - NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4 - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_2
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_1
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0 - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86 - NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2 - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2

2
boards/ek-lm4f120xl/Makefile.features
View File

@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_1

2
boards/f4vi1/Makefile.features
View File

@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_1

2
boards/frdm-k64f/Makefile.features
View File

@ -15,4 +15,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 EATURES_MCU_GROUP = cortex_m4_1

2
boards/msbiot/Makefile.features
View File

@ -13,4 +13,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_1

2
boards/mulle/Makefile.features
View File

@ -15,4 +15,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_2

2
boards/nucleo-f303/Makefile.features
View File

@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_2

2
boards/nucleo-f334/Makefile.features
View File

@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_2

2
boards/nucleo-f401/Makefile.features
View File

@ -4,4 +4,4 @@ FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_cpuid
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_2

2
boards/pba-d-01-kw2x/Makefile.features
View File

@ -14,4 +14,4 @@ FEATURES_PROVIDED += periph_uart
# Various other features (if any) # Various other features (if any)
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_1

2
boards/slwstk6220a/Makefile.features
View File

@ -5,4 +5,4 @@ FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_1

2
boards/stm32f3discovery/Makefile.features
View File

@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_1

2
boards/stm32f4discovery/Makefile.features
View File

@ -15,7 +15,7 @@ FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += arduino FEATURES_PROVIDED += arduino
# The board MPU family (used for grouping by the CI system) # The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m4 FEATURES_MCU_GROUP = cortex_m4_2
# TODO: re-think concept for conflicts based on actual used peripherals... # TODO: re-think concept for conflicts based on actual used peripherals...
FEATURES_CONFLICT += periph_spi:periph_dac FEATURES_CONFLICT += periph_spi:periph_dac

2
dist/tools/drone-scripts/build_and_test.sh vendored
View File

@ -66,7 +66,7 @@ if $FULL_CHECK; then
# output) # output)
parallel -k exec_build_func {} "$@" ::: static-tests avr8 msp430 x86 arm7 \ parallel -k exec_build_func {} "$@" ::: static-tests avr8 msp430 x86 arm7 \
cortex_m0 cortex_m3_1 cortex_m3_2 \ cortex_m0 cortex_m3_1 cortex_m3_2 \
cortex_m4 \ cortex_m4_1 cortex_m4_2 \
|& tee -a "$MYTMPDIR/output.log" |& tee -a "$MYTMPDIR/output.log"
else else
echo "PR not ready for CI build. Only static-tests will be executed!" echo "PR not ready for CI build. Only static-tests will be executed!"

3
dist/tools/travis-scripts/get-pkg-list.py vendored
View File

@ -20,7 +20,8 @@
import os import os
arm_mcu_groups = ["arm7", "cortex_m0", "cortex_m3_1", "cortex_m3_2", "cortex_m4"] arm_mcu_groups = ["arm7", "cortex_m0", "cortex_m3_1", "cortex_m3_2",
"cortex_m4_1", "cortex_m4_2"]
msp_mcu_groups = ["msp430"] msp_mcu_groups = ["msp430"]
x86_mcu_groups = ["x86"] x86_mcu_groups = ["x86"]
avr8_mcu_groups = ["avr8"] avr8_mcu_groups = ["avr8"]