From 8877c934eaba11cc7efe4bb2dab73a812a7a4c16 Mon Sep 17 00:00:00 2001
From: simbit18 <101105604+simbit18@users.noreply.github.com>
Date: Fri, 17 Jan 2025 10:28:52 +0100
Subject: [PATCH] [CI] testbuild.sh: Msys2 fix toolchain change

In the Msys2 (Windows) environment, this search filter is not sufficient.

$ grep _TOOLCHAIN_ .config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y
CONFIG_TOOLCHAIN_WINDOWS=y
CONFIG_ARM_TOOLCHAIN_GNU_EABI=y

It is necessary to add
$ grep _TOOLCHAIN_ .config |  grep -v CONFIG_TOOLCHAIN_WINDOWS | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y
CONFIG_ARM_TOOLCHAIN_GNU_EABI=y
---
 tools/testbuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 6a8306a6b5ffb..bef77e35e2e83 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -324,7 +324,7 @@ function configure_default {
   fi
 
   if [ "X$toolchain" != "X" ]; then
-    setting=`grep _TOOLCHAIN_ $nuttx/.config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
+    setting=`grep _TOOLCHAIN_ $nuttx/.config | grep -v CONFIG_TOOLCHAIN_WINDOWS | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
     original_toolchain=`echo $setting | cut -d'=' -f1`
     if [ ! -z "$original_toolchain" ]; then
       echo "  Disabling $original_toolchain"
@@ -347,7 +347,7 @@ function configure_cmake {
   fi
 
   if [ "X$toolchain" != "X" ]; then
-    setting=`grep _TOOLCHAIN_ $nuttx/build/.config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
+    setting=`grep _TOOLCHAIN_ $nuttx/build/.config | grep -v CONFIG_TOOLCHAIN_WINDOWS | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
     original_toolchain=`echo $setting | cut -d'=' -f1`
     if [ ! -z "$original_toolchain" ]; then
       echo "  Disabling $original_toolchain"