[incubator-nuttx-testing] branch master updated: cibuild.sh: use pushd/popd to make sure testlist path correctly

[xi...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 97098c2  cibuild.sh: use pushd/popd to make sure testlist path correctly
97098c2 is described below

commit 97098c26d2eca5ce81dd7beeaf74287171f12e1a
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Mar 5 10:09:14 2020 +0800

    cibuild.sh: use pushd/popd to make sure testlist path correctly
    
    Signed-off-by: liuhaitao <li...@xiaomi.com>
---
 cibuild.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cibuild.sh b/cibuild.sh
index 50f850c..f6dc1d1 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -152,6 +152,7 @@ function enable_ccache {
 }
 
 function setup_repos {
+  pushd .
   if [ -d "$nuttx" ]; then
     cd $nuttx; git pull
   else
@@ -163,12 +164,15 @@ function setup_repos {
   else
     git clone https://github.com/apache/incubator-nuttx-apps.git $apps
   fi
+  popd
 }
 
 function install_tools {
+  pushd .
   for func in $install; do
     $func
   done
+  popd
 }
 
 function run_builds {
@@ -176,10 +180,7 @@ function run_builds {
   options+="-j $ncpus"
 
   for build in $builds; do
-    local builddir=$(cd $(dirname $build) && pwd)
-    local buildfile=$(basename $build)
-
-    $nuttx/tools/testbuild.sh $options $builddir/$buildfile
+    $nuttx/tools/testbuild.sh $options $build
   done
 }