From 77d56bb6c2e8d33063afc5ee7c7930459eb8edab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 28 Jul 2015 15:00:37 +0200 Subject: [PATCH] Add yotta test builds to all.sh --- tests/scripts/all.sh | 6 +++++- tests/scripts/yotta-build.sh | 37 ++++++++++++++++++++++++++++++++++++ yotta/create-module.sh | 26 ++----------------------- 3 files changed, 44 insertions(+), 25 deletions(-) create mode 100755 tests/scripts/yotta-build.sh diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 14abd2d9a..8b171ba27 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -41,7 +41,7 @@ cleanup() { make clean - find . -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+ + find . -name yotta -prune -o -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+ rm -f include/Makefile include/mbedtls/Makefile programs/*/Makefile git update-index --no-skip-worktree Makefile library/Makefile programs/Makefile tests/Makefile git checkout -- Makefile library/Makefile programs/Makefile tests/Makefile @@ -83,6 +83,10 @@ msg "test/build: declared and exported names" # < 3s cleanup tests/scripts/check-names.sh +msg "build: create and build yotta module" # ~ 30s +cleanup +tests/scripts/yotta-build.sh + msg "build: cmake, gcc, ASan" # ~ 1 min 50s cleanup CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan . diff --git a/tests/scripts/yotta-build.sh b/tests/scripts/yotta-build.sh new file mode 100755 index 000000000..59cedf42b --- /dev/null +++ b/tests/scripts/yotta-build.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +# Do test builds of the yotta module for all supported targets + +set -eu + +yotta/create-module.sh +cd yotta/module +# yt update # needs network + +yotta_build() +{ + TARGET=$1 + echo; echo "*** $TARGET ***" + yt target $TARGET + yt build +} + +if uname -a | grep 'Linux.*x86' >/dev/null; then + yotta_build x86-linux-native +fi +if uname -a | grep 'Darwin.*x86' >/dev/null; then + yotta_build x86-osx-native +fi +if which armcc >/dev/null && armcc --help >/dev/null 2>&1; then + yotta_build frdm-k64f-armcc + #yotta_build nordic-nrf51822-16k-armcc +fi +if which arm-none-eabi-gcc >/dev/null; then + yotta_build frdm-k64f-gcc + #yotta_build st-nucleo-f401re-gcc # dirent + #yotta_build stm32f429i-disco-gcc # fails in mbed-hal-st-stm32f4 + #yotta_build nordic-nrf51822-16k-gcc # fails in minar-platform + #yotta_build bbc-microbit-classic-gcc # fails in minar-platform + #yotta_build st-stm32f439zi-gcc # fails in mbed-hal-st-stm32f4 + #yotta_build st-stm32f429i-disco-gcc # fails in mbed-hal-st-stm32f4 +fi diff --git a/yotta/create-module.sh b/yotta/create-module.sh index 73dc92521..370945538 100755 --- a/yotta/create-module.sh +++ b/yotta/create-module.sh @@ -2,11 +2,9 @@ set -eu +# relative to the script's directory TREE=.. - -# default values, can be overriden by the environment -: ${DEST:=module} -: ${BUILD:=1} +DEST=module # make sure we're running in our own directory if [ -f create-module.sh ]; then :; else @@ -44,23 +42,3 @@ rsync -cr --delete --exclude build --exclude yotta_\* $TMP/ $DEST/ rm -rf $TMP echo "mbed TLS yotta module created in '$DEST'." - -test_build() -{ - TARGET=$1 - echo; echo "*** Doing a test build for $TARGET ***" - ( cd $DEST && yt target $TARGET && yt build ) -} - -if [ $BUILD -eq 1 ]; then - if uname -a | grep 'Linux.*x86' >/dev/null; then - test_build x86-linux-native - fi - - if uname -a | grep 'Darwin.*x86' >/dev/null; then - test_build x86-osx-native - fi - - # do that one last so that it remains the target - test_build frdm-k64f-gcc -fi