This is an automated email from the ASF dual-hosted git repository.
yamamoto 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 ed7d1dc tools/testbuild.sh: update makefunc to hardcode make/extra
flags options and redirection
new ac18fc0 Merge pull request #792 from liuguo09/testbuild
ed7d1dc is described below
commit ed7d1dc6114ee4bc0da0cbc86bb934a88afbb757
Author: liuhaitao <liuhai...@xiaomi.com>
AuthorDate: Tue Apr 14 19:57:32 2020 +0800
tools/testbuild.sh: update makefunc to hardcode make/extra flags options
and redirection
Aim to let makefunc caller just pass in the target. So update makefunc to
hardcode make/extra
flags options and redirection, meanwhile avoid the case in which makefunc
would remove the quotes
for EXTRAFLAGS. Note that JOPTIONS should also hardcode once parallel build
break finally fixed.
Signed-off-by: liuhaitao <liuhai...@xiaomi.com>
---
tools/testbuild.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index 9125f34..eca88ee 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -158,7 +158,7 @@ blacklist=`grep "^-" $testfile || true`
cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }
function makefunc {
- ${MAKE} $@
+ ${MAKE} ${MAKE_FLAGS} "${EXTRA_FLAGS}" $@ 1>/dev/null
ret=$?
if [ $ret != 0 ]; then
fail=$ret
@@ -178,7 +178,7 @@ function distclean {
if [ ${GITCLEAN} -eq 1 ]; then
distclean_with_git
else
- makefunc ${JOPTION} ${MAKE_FLAGS} distclean 1>/dev/null
+ makefunc ${JOPTION} distclean
fi
fi
}
@@ -211,7 +211,7 @@ function configure {
echo " Refreshing..."
- makefunc ${MAKE_FLAGS} olddefconfig 1>/dev/null
+ makefunc olddefconfig 1>/dev/null
fi
}
@@ -220,7 +220,7 @@ function configure {
function build {
echo " Building NuttX..."
echo
"------------------------------------------------------------------------------------"
- makefunc ${JOPTION} ${MAKE_FLAGS} ${EXTRA_FLAGS} 1>/dev/null
+ makefunc ${JOPTION}
}
# Coordinate the steps for the next build test
