From 102c4c25e26518505175b66607d6d4394cfe72ee Mon Sep 17 00:00:00 2001 From: liuhaitao Date: Mon, 18 May 2020 16:11:50 +0800 Subject: [PATCH] tools/testbuild.sh: Call makefunc with JOPTION directly Also call configure.sh with JOPTION to enable parallel build Change-Id: I32c4e77fb30c40d8d424159cc0871b8c3e3f10b6 Signed-off-by: liuhaitao --- tools/testbuild.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testbuild.sh b/tools/testbuild.sh index e49267ba6f..b887b3b03b 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 { - if ! ${MAKE} ${MAKE_FLAGS} "${EXTRA_FLAGS}" $@ 1>/dev/null; then + if ! ${MAKE} ${MAKE_FLAGS} "${EXTRA_FLAGS}" ${JOPTION} $@ 1>/dev/null; then fail=1 fi } @@ -172,7 +172,7 @@ function distclean { git -C $nuttx clean -xfdq git -C $APPSDIR clean -xfdq else - makefunc ${JOPTION} distclean + makefunc distclean # Remove .version manually because this file is shipped with # the release package and then distclean has to keep it @@ -199,7 +199,7 @@ function distclean { function configure { echo " Configuring..." - if ! ./tools/configure.sh ${HOPTION} $config; then + if ! ./tools/configure.sh ${HOPTION} $config ${JOPTION}; then fail=1 fi @@ -231,7 +231,7 @@ function configure { function build { echo " Building NuttX..." - makefunc ${JOPTION} + makefunc # Ensure defconfig in the canonical form