Extended tools/testbuild.sh to work with simulator builds which have no toolchain definition

This commit is contained in:
Gregory Nutt 2015-11-29 14:42:32 -06:00
parent 5c9e05693e
commit fc0c775b6f

View File

@ -173,15 +173,17 @@ function configure {
kconfig-tweak --file $nuttx/.config --disable CONFIG_CXX_NEWLONG kconfig-tweak --file $nuttx/.config --disable CONFIG_CXX_NEWLONG
fi fi
setting=`grep TOOLCHAIN $nuttx/.config | grep =y` if [ "X$toolchain" != "X" ]; then
varname=`echo $setting | cut -d'=' -f1` setting=`grep TOOLCHAIN $nuttx/.config | grep =y`
if [ ! -z "varname" ]; then varname=`echo $setting | cut -d'=' -f1`
echo " Disabling $varname" if [ ! -z "varname" ]; then
kconfig-tweak --file $nuttx/.config --disable $varname echo " Disabling $varname"
fi kconfig-tweak --file $nuttx/.config --disable $varname
fi
echo " Enabling $toolchain" echo " Enabling $toolchain"
kconfig-tweak --file $nuttx/.config --enable $toolchain kconfig-tweak --file $nuttx/.config --enable $toolchain
fi
echo " Refreshing..." echo " Refreshing..."
kconfig-conf --olddefconfig Kconfig 1>/dev/null kconfig-conf --olddefconfig Kconfig 1>/dev/null
@ -232,10 +234,12 @@ for line in $testlist; do
showusage showusage
fi fi
toolchain=`echo $line | cut -d',' -f2` unset toolchain;
if [ -z "$toolchain" ]; then if [ "X$config" != "X$line" ]; then
echo "ERROR no tool configuration" toolchain=`echo $line | cut -d',' -f2`
showusage if [ -z "$toolchain" ]; then
echo " Warning: no tool configuration"
fi
fi fi
# Perform the build test # Perform the build test