Skip to content

tools/testbuild: restore the original toolchain configuration before refresh #9858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raiden00pl merged 1 commit into from
Jul 20, 2023
Merged

tools/testbuild: restore the original toolchain configuration before refresh #9858

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions tools/testbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down