sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in david_s5/nuttx/master_ci (pull request #391)

Browse Source 
testbuild:Added -x to fail build on errors for CI

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
David Sidrane 2017-06-13 18:53:53 +00:00 committed by Gregory Nutt
commit 72ff151343
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/testbuild.sh
View File

@ -43,6 +43,8 @@ wenv=cygwin
sizet=uint sizet=uint
APPSDIR=../apps APPSDIR=../apps
NXWDIR=../NxWidgets NXWDIR=../NxWidgets
MAKE_FLAGS=-i
MAKE=make
unset testfile unset testfile
function showusage { function showusage {
@ -58,6 +60,7 @@ function showusage {
echo " -a <appsdir> provides the relative path to the apps/ directory. Default ../apps" echo " -a <appsdir> provides the relative path to the apps/ directory. Default ../apps"
echo " -n <nxdir> provides the relative path to the NxWidgets/ directory. Default ../NxWidgets" echo " -n <nxdir> provides the relative path to the NxWidgets/ directory. Default ../NxWidgets"
echo " -d enables script debug output" echo " -d enables script debug output"
echo " -x exit on build failures"
echo " -h will show this help test and terminate" echo " -h will show this help test and terminate"
echo " <testlist-file> selects the list of configurations to test. No default" echo " <testlist-file> selects the list of configurations to test. No default"
echo "" echo ""
@ -96,6 +99,10 @@ while [ ! -z "$1" ]; do
host=windows host=windows
sizet=long sizet=long
;; ;;
-x )
MAKE_FLAGS='--silent --no-print-directory'
set -e
;;
-a ) -a )
shift shift
APPSDIR="$1" APPSDIR="$1"
@ -142,7 +149,7 @@ function distclean {
cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; } cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }
if [ -f .config ]; then if [ -f .config ]; then
echo " Cleaning..." echo " Cleaning..."
make distclean 1>/dev/null ${MAKE} ${MAKE_FLAGS} distclean 1>/dev/null
fi fi
} }
@ -225,7 +232,7 @@ function configure {
echo " Refreshing..." echo " Refreshing..."
cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; } cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }
make olddefconfig 1>/dev/null 2>&1 ${MAKE} ${MAKE_FLAGS} olddefconfig 1>/dev/null 2>&1
} }
# Build the NxWidgets libraries # Build the NxWidgets libraries
@ -237,7 +244,7 @@ function nxbuild {
unset nxconfig unset nxconfig
if [ -d $NXWDIR ]; then if [ -d $NXWDIR ]; then
nxconfig=`grep CONFIG_NXWM=y $nuttx/.config` nxconfig=`grep CONFIG_NXWM=y $nuttx/.config` || true
fi fi
if [ ! -z "$nxconfig" ]; then if [ ! -z "$nxconfig" ]; then
@ -247,18 +254,18 @@ function nxbuild {
cd $nuttx/$NXTOOLS || { echo "Failed to CD to $NXTOOLS"; exit 1; } cd $nuttx/$NXTOOLS || { echo "Failed to CD to $NXTOOLS"; exit 1; }
./install.sh $nuttx/$APPSDIR nxwm 1>/dev/null ./install.sh $nuttx/$APPSDIR nxwm 1>/dev/null
make -C $nuttx/$APPSDIR/external TOPDIR=$nuttx APPDIR=$nuttx/$APPSDIR TOPDIR=$nuttx clean 1>/dev/null ${MAKE} ${MAKE_FLAGS} -C $nuttx/$APPSDIR/external TOPDIR=$nuttx APPDIR=$nuttx/$APPSDIR TOPDIR=$nuttx clean 1>/dev/null
cd $nuttx || { echo "Failed to CD to $nuttx"; exit 1; } cd $nuttx || { echo "Failed to CD to $nuttx"; exit 1; }
make -i context 1>/dev/null ${MAKE} ${MAKE_FLAGS} context 1>/dev/null
cd $nuttx/$NXWIDGETSDIR || { echo "Failed to CD to $NXWIDGETSDIR"; exit 1; } cd $nuttx/$NXWIDGETSDIR || { echo "Failed to CD to $NXWIDGETSDIR"; exit 1; }
make -i TOPDIR=$nuttx clean 1>/dev/null ${MAKE} ${MAKE_FLAGS} TOPDIR=$nuttx clean 1>/dev/null
make -i TOPDIR=$nuttx 1>/dev/null ${MAKE} ${MAKE_FLAGS} TOPDIR=$nuttx 1>/dev/null
cd $nuttx/$NXWMDIR || { echo "Failed to CD to $NXWMDIR"; exit 1; } cd $nuttx/$NXWMDIR || { echo "Failed to CD to $NXWMDIR"; exit 1; }
make -i TOPDIR=$nuttx clean 1>/dev/null ${MAKE} ${MAKE_FLAGS} TOPDIR=$nuttx clean 1>/dev/null
make -i TOPDIR=$nuttx 1>/dev/null ${MAKE} ${MAKE_FLAGS} TOPDIR=$nuttx 1>/dev/null
fi fi
} }
@ -268,7 +275,7 @@ function build {
cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; } cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }
echo " Building NuttX..." echo " Building NuttX..."
echo "------------------------------------------------------------------------------------" echo "------------------------------------------------------------------------------------"
make -i 1>/dev/null ${MAKE} ${MAKE_FLAGS} 1>/dev/null
} }
# Coordinate the steps for the next build test # Coordinate the steps for the next build test