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/04/21 22:15:56 UTC

[incubator-nuttx] branch master updated: tools/testbuild.sh: check status after make distclean

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 fc8522c  tools/testbuild.sh: check status after make distclean
fc8522c is described below

commit fc8522cc97789b611be10accb70152d3535ecb92
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Apr 22 00:39:56 2020 +0800

    tools/testbuild.sh: check status after make distclean
    
    ensure the distclean remove all generated stuff
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 tools/testbuild.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 3f1d949..8e67851 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -173,6 +173,19 @@ function distclean {
       git -C $APPSDIR clean -xfdq
     else
       makefunc ${JOPTION} distclean
+
+      # Ensure nuttx and apps directory in clean state even with --ignored
+
+      if [ -d $nuttx/.git ] || [ -d $APPSDIR/.git ]; then
+        if [[ -n $(git -C $nuttx status --ignored -s) ]]; then
+          git -C $nuttx status --ignored
+          fail=1
+        fi
+        if [[ -n $(git -C $APPSDIR status --ignored -s) ]]; then
+          git -C $APPSDIR status --ignored
+          fail=1
+        fi
+      fi
     fi
   fi
 }