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/03 14:07:04 UTC

[incubator-nuttx] branch master updated: tools/testbuild.sh: prevent grep from exiting in case of nomatch

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 58318bb  tools/testbuild.sh: prevent grep from exiting in case of nomatch
58318bb is described below

commit 58318bbc2875b1f9c4cde8b4a858a6288190d336
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Tue Mar 3 17:44:03 2020 +0800

    tools/testbuild.sh: prevent grep from exiting in case of nomatch
    
    Prevent grep from exiting in case of nomatch for blacklist when testbuild.sh called
    with -x option which set -e in bash.
---
 tools/testbuild.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index ad8f82c..5cbb82c 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -131,8 +131,8 @@ fi
 
 export APPSDIR
 
-testlist=`grep -v "^-" $testfile`
-blacklist=`grep "^-" $testfile`
+testlist=`grep -v "^-" $testfile || true`
+blacklist=`grep "^-" $testfile || true`
 
 cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }