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 <liuhaitao@xiaomi.com>
This commit is contained in:
liuhaitao
2020-04-14 19:57:32 +08:00
parent 9b86305ad3
commit ed7d1dc611
+4 -4
View File
@@ -158,7 +158,7 @@ blacklist=`grep "^-" $testfile || true`
cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; } cd $nuttx || { echo "ERROR: failed to CD to $nuttx"; exit 1; }
function makefunc { function makefunc {
${MAKE} $@ ${MAKE} ${MAKE_FLAGS} "${EXTRA_FLAGS}" $@ 1>/dev/null
ret=$? ret=$?
if [ $ret != 0 ]; then if [ $ret != 0 ]; then
fail=$ret fail=$ret
@@ -178,7 +178,7 @@ function distclean {
if [ ${GITCLEAN} -eq 1 ]; then if [ ${GITCLEAN} -eq 1 ]; then
distclean_with_git distclean_with_git
else else
makefunc ${JOPTION} ${MAKE_FLAGS} distclean 1>/dev/null makefunc ${JOPTION} distclean
fi fi
fi fi
} }
@@ -211,7 +211,7 @@ function configure {
echo " Refreshing..." echo " Refreshing..."
makefunc ${MAKE_FLAGS} olddefconfig 1>/dev/null makefunc olddefconfig 1>/dev/null
fi fi
} }
@@ -220,7 +220,7 @@ function configure {
function build { function build {
echo " Building NuttX..." echo " Building NuttX..."
echo "------------------------------------------------------------------------------------" echo "------------------------------------------------------------------------------------"
makefunc ${JOPTION} ${MAKE_FLAGS} ${EXTRA_FLAGS} 1>/dev/null makefunc ${JOPTION}
} }
# Coordinate the steps for the next build test # Coordinate the steps for the next build test