You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/03/07 15:33:08 UTC

[incubator-nuttx] branch master updated: toos/testbuild.sh: Remove the below warnning in nightly build

This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 0d02168  toos/testbuild.sh: Remove the below warnning in nightly build
0d02168 is described below

commit 0d02168d284049ac4a6e52224e9e90a024424d13
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Mar 7 22:22:11 2020 +0800

    toos/testbuild.sh: Remove the below warnning in nightly build
    
    ====================================================================================
    Configuration/Tool: lm3s6432-s2e/nsh,CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
    
    Change-Id: I95cd6f0c00f68c68f9175574d44e75e24c41bc12
    ------------------------------------------------------------------------------------
      Cleaning...
      Configuring...
      Copy files
      Select CONFIG_HOST_LINUX=y
      Refreshing...
      Disabling CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL
      Enabling CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL
      Refreshing...
    .config:1542:warning: override: reassigning to symbol ARMV7M_TOOLCHAIN_GNU_EABIL
      Building NuttX...
    ------------------------------------------------------------------------------------
---
 tools/testbuild.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 5cbb82c..69f1c31 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -160,7 +160,7 @@ function configure {
   ./tools/configure.sh ${HOPTION} $config
 
   if [ "X$toolchain" != "X" ]; then
-    setting=`grep _TOOLCHAIN_ $nuttx/.config | grep -v CONFIG_ARCH_TOOLCHAIN_*=y | grep =y`
+    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"
@@ -168,6 +168,7 @@ function configure {
     fi
 
     echo "  Enabling $toolchain"
+    sed -i -e "/$toolchain/d" $nuttx/.config
     echo "$toolchain=y" >> $nuttx/.config
 
     if [ "X$sizet" == "Xuint" ]; then