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

tools/testbuild: restore the original toolchain configuration before refresh

Browse Source 
Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2023-07-20 10:41:42 +08:00 committed by Mateusz Szafoni
parent 3c359da8b9
commit 99c29bda70
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/testbuild.sh
View File

@ -310,10 +310,10 @@ function configure_default {
if [ "X$toolchain" != "X" ]; then
setting=`grep _TOOLCHAIN_ $nuttx/.config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
varname=`echo $setting | cut -d'=' -f1`
if [ ! -z "$varname" ]; then
echo " Disabling $varname"
kconfig-tweak --file $nuttx/.config -d $varname
original_toolchain=`echo $setting | cut -d'=' -f1`
if [ ! -z "$original_toolchain" ]; then
echo " Disabling $original_toolchain"
kconfig-tweak --file $nuttx/.config -d $original_toolchain
fi
echo " Enabling $toolchain"
@ -333,10 +333,10 @@ function configure_cmake {
if [ "X$toolchain" != "X" ]; then
setting=`grep _TOOLCHAIN_ $nuttx/build/.config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
varname=`echo $setting | cut -d'=' -f1`
if [ ! -z "$varname" ]; then
echo " Disabling $varname"
kconfig-tweak --file $nuttx/build/.config -d $varname
original_toolchain=`echo $setting | cut -d'=' -f1`
if [ ! -z "$original_toolchain" ]; then
echo " Disabling $original_toolchain"
kconfig-tweak --file $nuttx/build/.config -d $original_toolchain
fi
echo " Enabling $toolchain"
@ -419,6 +419,14 @@ function refresh_default {
function refresh_cmake {
# Ensure defconfig in the canonical form
if [ "X$toolchain" != "X" ]; then
if [ ! -z "$original_toolchain" ]; then
kconfig-tweak --file $nuttx/build/.config -e $original_toolchain
fi
kconfig-tweak --file $nuttx/build/.config -d $toolchain
fi
if ! cmake --build build -t savedefconfig 1>/dev/null; then
cmake --build build -t savedefconfig
fail=1
@ -521,6 +529,7 @@ function dotest {
fi
unset toolchain
unset original_toolchain
if [ "X$config" != "X$1" ]; then
toolchain=`echo $1 | cut -d',' -f2`
if [ -z "$toolchain" ]; then