From cb55c530bd54a795ef6989eee78cbe457c03d183 Mon Sep 17 00:00:00 2001
From: Yakun Xu <xyk@google.com>
Date: Tue, 24 Mar 2020 22:29:48 +0800
Subject: [PATCH] [cmake] clean up cmake options (#4727)

* enable optional features
* remove OT_NCP
* remove OT_NCP_RADIO_ONLY
* sort options
---
 etc/cmake/options.cmake | 58 +++++++++++++++++------------------------
 script/test             | 16 ++++++++++++
 2 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/etc/cmake/options.cmake b/etc/cmake/options.cmake
index c5eff32ee..624abf818 100644
--- a/etc/cmake/options.cmake
+++ b/etc/cmake/options.cmake
@@ -41,19 +41,17 @@ if(OT_BORDER_ROUTER)
     list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE=1")
 endif()
 
-option(OT_COAP "enable coap api support")
-if(OT_COAP)
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_COAP_API_ENABLE=1")
+if(OT_BUILTIN_MBEDTLS)
+    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS=1")
+else()
+    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS=0")
 endif()
 
-option(OT_COAPS "enable secure coap api support")
-if(OT_COAPS)
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE=1")
-endif()
-
-option(OT_COMMISSIONER "enable commissioner support")
-if(OT_COMMISSIONER)
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_COMMISSIONER_ENABLE=1")
+option(OT_BUILTIN_MBEDTLS_MANAGEMENT "enable builtin mbedtls management" ON)
+if(OT_BUILTIN_MBEDTLS_MANAGEMENT)
+    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS_MANAGEMENT=1")
+else()
+    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS_MANAGEMENT=0")
 endif()
 
 option(OT_CHANNEL_MANAGER "enable channel manager support")
@@ -71,6 +69,21 @@ if(OT_CHILD_SUPERVISION)
     list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_CHILD_SUPERVISION_ENABLE=1")
 endif()
 
+option(OT_COAP "enable coap api support")
+if(OT_COAP)
+    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_COAP_API_ENABLE=1")
+endif()
+
+option(OT_COAPS "enable secure coap api support")
+if(OT_COAPS)
+    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE=1")
+endif()
+
+option(OT_COMMISSIONER "enable commissioner support")
+if(OT_COMMISSIONER)
+    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_COMMISSIONER_ENABLE=1")
+endif()
+
 option(OT_DHCP6_CLIENT "enable DHCP6 client support")
 if(OT_DHCP6_CLIENT)
     list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE=1")
@@ -136,16 +149,6 @@ if(OT_MTD_NETDIAG)
     list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_TMF_NETWORK_DIAG_MTD_ENABLE=1")
 endif()
 
-option(OT_NCP "enable network co-processor NCP")
-if(OT_NCP)
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_ENABLE_NCP=1")
-endif()
-
-option(OT_NCP_RADIO_ONLY "run NCP in radio only mode")
-if(OT_NCP_RADIO_ONLY)
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_ENABLE_RADIO_ONLY=1")
-endif()
-
 option(OT_PLATFORM_UDP "enable platform UDP support")
 if(OT_PLATFORM_UDP)
     list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_PLATFORM_UDP_ENABLE=1")
@@ -205,16 +208,3 @@ if(OT_FULL_LOGS)
     list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL=1")
     list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_LOG_PREPEND_REGION=1")
 endif()
-
-if(OT_BUILTIN_MBEDTLS)
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS=1")
-else()
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS=0")
-endif()
-
-option(OT_BUILTIN_MBEDTLS_MANAGEMENT "enable builtin mbedtls management" ON)
-if(OT_BUILTIN_MBEDTLS_MANAGEMENT)
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS_MANAGEMENT=1")
-else()
-    list(APPEND OT_PRIVATE_DEFINES "OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS_MANAGEMENT=0")
-endif()
diff --git a/script/test b/script/test
index 3c836e2b5..acff6a756 100755
--- a/script/test
+++ b/script/test
@@ -36,10 +36,25 @@ readonly OT_BUILD_JOBS=$(getconf _NPROCESSORS_ONLN)
 readonly OT_BUILDDIR="$(pwd)/build"
 readonly OT_SRCDIR="$(pwd)"
 readonly OT_TEST_COMMON_OPTIONS=(
+    "-DOT_BORDER_AGENT=ON"
+    "-DOT_BORDER_ROUTER=ON"
+    "-DOT_CHANNEL_MANAGER=ON"
+    "-DOT_CHANNEL_MONITOR=ON"
     "-DOT_CHILD_SUPERVISION=ON"
+    "-DOT_COAP=ON"
+    "-DOT_COAPS=ON"
+    "-DOT_COMMISSIONER=ON"
     "-DOT_COVERAGE=ON"
+    "-DOT_DHCP6_CLIENT=ON"
+    "-DOT_DHCP6_SERVER=ON"
+    "-DOT_DIAGNOSTIC=ON"
+    "-DOT_IP6_FRAGM=ON"
+    "-DOT_JAM_DETECTION=ON"
+    "-DOT_JOINER=ON"
     "-DOT_MAC_FILTER=ON"
     "-DOT_REFERENCE_DEVICE=ON"
+    "-DOT_SERVICE=ON"
+    "-DOT_SLAAC=ON"
 )
 
 readonly COLOR_PASS='\033[0;32m'
@@ -86,6 +101,7 @@ build_posix()
 
     options+=(
         "-DOT_PLATFORM=posix"
+        "-DOT_READLINE=readline"
         "-DOT_THREAD_VERSION=${version}"
     )