You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2021/11/23 16:17:34 UTC

[incubator-nuttx] branch master updated (0f76ff4 -> 36a6f4c)

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

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


    from 0f76ff4  arch/sim: add arch elf define
     new e6e3cc7  boards/sim: Automatically run ostest for asan and kasan config
     new 403b09f  tools/release.sh: Build sim:asan instead of sim:nsh
     new 36a6f4c  tools/checkrelease.sh: Launch nuttx after build

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 boards/sim/sim/sim/configs/asan/defconfig  |  1 +
 boards/sim/sim/sim/configs/kasan/defconfig |  1 +
 tools/checkrelease.sh                      | 27 ++++++++++++++++++++-------
 3 files changed, 22 insertions(+), 7 deletions(-)

[incubator-nuttx] 01/03: boards/sim: Automatically run ostest for asan and kasan config

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e6e3cc7e02ab174a5824c45a7b45a6e16d8d79bd
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Nov 23 02:47:51 2021 +0800

    boards/sim: Automatically run ostest for asan and kasan config
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 boards/sim/sim/sim/configs/asan/defconfig  | 1 +
 boards/sim/sim/sim/configs/kasan/defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/boards/sim/sim/sim/configs/asan/defconfig b/boards/sim/sim/sim/configs/asan/defconfig
index 7220986..b2bfd63 100644
--- a/boards/sim/sim/sim/configs/asan/defconfig
+++ b/boards/sim/sim/sim/configs/asan/defconfig
@@ -22,6 +22,7 @@ CONFIG_FS_AIO=y
 CONFIG_FS_BINFS=y
 CONFIG_FS_NAMED_SEMAPHORES=y
 CONFIG_FS_PROCFS=y
+CONFIG_INIT_ARGS="\"-c\", \"ostest;poweroff\""
 CONFIG_MM_CUSTOMIZE_MANAGER=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/kasan/defconfig b/boards/sim/sim/sim/configs/kasan/defconfig
index 2a5d9b9b..75f1fd4 100644
--- a/boards/sim/sim/sim/configs/kasan/defconfig
+++ b/boards/sim/sim/sim/configs/kasan/defconfig
@@ -22,6 +22,7 @@ CONFIG_FS_AIO=y
 CONFIG_FS_BINFS=y
 CONFIG_FS_NAMED_SEMAPHORES=y
 CONFIG_FS_PROCFS=y
+CONFIG_INIT_ARGS="\"-c\", \"ostest;poweroff\""
 CONFIG_MM_KASAN=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y

[incubator-nuttx] 02/03: tools/release.sh: Build sim:asan instead of sim:nsh

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 403b09fa606cdef43a917e002b41dc84334d1aa6
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Nov 23 02:49:13 2021 +0800

    tools/release.sh: Build sim:asan instead of sim:nsh
    
    since sim:asan could do more check
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 tools/checkrelease.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/checkrelease.sh b/tools/checkrelease.sh
index 82a6ada..560d32a 100755
--- a/tools/checkrelease.sh
+++ b/tools/checkrelease.sh
@@ -133,18 +133,18 @@ function check_nuttx_apps() {
     check_required_files "$RELEASE_DIR"
 }
 
-function check_sim_nsh_build() {
+function check_sim_asan_build() {
     RELEASE_DIR="nuttx"
-    echo "Trying to build $RELEASE_DIR sim:nsh..."
+    echo "Trying to build $RELEASE_DIR sim:asan..."
     cd "$RELEASE_DIR"
-    output=$(make distclean; ./tools/configure.sh sim:nsh; make) 2>&1
+    output=$(make distclean; ./tools/configure.sh sim:asan; make) 2>&1
     return_value=$?
     if [ $return_value -eq 0 ]; then
-      echo " OK: we were able to build sim:nsh."
+      echo " OK: we were able to build sim:asan."
     else
       RETURN_CODE=1
       echo "$output"
-      echo " - Error building sim:nsh."
+      echo " - Error building sim:asan."
     fi
     echo
 }
@@ -154,7 +154,7 @@ function usage() {
     echo "   Given release full URL, release name, or a local directory, downloads or copies"
     echo "   all files in that directory (which for a release should include nuttx and nuttx-apps, sha512, "
     echo "   asc, and tar.gz files), checks the release SHA512 and GPG signatures, checks the unpacked "
-    echo "   directories for required files, and tries to build NuttX for sim:nsh."
+    echo "   directories for required files, and tries to build NuttX for sim:asan."
     echo
     echo "   If tempdir is specified, it will be removed and recreated; if it is not specified, /tmp/nuttx-checkrelease"
     echo "   is used."
@@ -212,6 +212,6 @@ download_release
 import_key
 check_nuttx
 check_nuttx_apps
-check_sim_nsh_build
+check_sim_asan_build
 
 exit $RETURN_CODE

[incubator-nuttx] 03/03: tools/checkrelease.sh: Launch nuttx after build

Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 36a6f4cd0968399c4b1160f8cb6191e65e2415eb
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Nov 23 03:00:54 2021 +0800

    tools/checkrelease.sh: Launch nuttx after build
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 tools/checkrelease.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/tools/checkrelease.sh b/tools/checkrelease.sh
index 560d32a..2335212 100755
--- a/tools/checkrelease.sh
+++ b/tools/checkrelease.sh
@@ -133,10 +133,11 @@ function check_nuttx_apps() {
     check_required_files "$RELEASE_DIR"
 }
 
-function check_sim_asan_build() {
+function check_sim_asan() {
     RELEASE_DIR="nuttx"
-    echo "Trying to build $RELEASE_DIR sim:asan..."
     cd "$RELEASE_DIR"
+
+    echo "Trying to build $RELEASE_DIR sim:asan..."
     output=$(make distclean; ./tools/configure.sh sim:asan; make) 2>&1
     return_value=$?
     if [ $return_value -eq 0 ]; then
@@ -147,6 +148,18 @@ function check_sim_asan_build() {
       echo " - Error building sim:asan."
     fi
     echo
+
+    echo "Trying to run $RELEASE_DIR sim:asan..."
+    output=$(./nuttx) 2>&1
+    return_value=$?
+    if [ $return_value -eq 0 ]; then
+      echo " OK: ostest with ASAN pass."
+    else
+      RETURN_CODE=1
+      echo "$output"
+      echo " - Error running sim:asan."
+    fi
+    echo
 }
 
 function usage() {
@@ -212,6 +225,6 @@ download_release
 import_key
 check_nuttx
 check_nuttx_apps
-check_sim_asan_build
+check_sim_asan
 
 exit $RETURN_CODE