From 48e6b97ca7fafd86d9f9c56b52d6ab2d12600b71 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 19 Apr 2020 17:25:27 +0800
Subject: [PATCH] tools/testbuild.sh: Check defconfig in the canonical format

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 tools/testbuild.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/testbuild.sh b/tools/testbuild.sh
index d1f3f34e8a4..4bef96e86e5 100755
--- a/tools/testbuild.sh
+++ b/tools/testbuild.sh
@@ -185,7 +185,9 @@ function distclean {
 
 function configure {
   echo "  Configuring..."
-  ./tools/configure.sh ${HOPTION} $config
+  if ! ./tools/configure.sh ${HOPTION} $config; then
+    fail=1
+  fi
 
   if [ "X$toolchain" != "X" ]; then
     setting=`grep _TOOLCHAIN_ $nuttx/.config | grep -v CONFIG_ARCH_TOOLCHAIN_* | grep =y`
@@ -207,9 +209,7 @@ function configure {
       sed -i -e "\$aCONFIG_ARCH_SIZET_LONG=y" $nuttx/.config
     fi
 
-
-    echo "  Refreshing..."
-    makefunc olddefconfig 1>/dev/null
+    makefunc olddefconfig
   fi
 }
 
@@ -217,8 +217,13 @@ function configure {
 
 function build {
   echo "  Building NuttX..."
-  echo "------------------------------------------------------------------------------------"
   makefunc ${JOPTION}
+
+  # Ensure defconfig in the canonical form
+
+  if ! ./tools/refresh.sh --silent $config; then
+    fail=1
+  fi
 }
 
 # Coordinate the steps for the next build test