Adds lib/support/tests to the ESP32 unit-test target. Makes platform-specific fixes to ParseArgs and EncodeTlvElement.

.vscode/tasks.json

@@ -104,9 +104,21 @@
             }
         },
         {
-            "label": "QEMU: run esp32-qemu unit tests",
+            "label": "Build esp32-qemu unit tests",
             "type": "shell",
-            "command": "scripts/tests/esp32_qemu_tests.sh /tmp/test_logs",
+            "command": "source scripts/activate.sh; src/test_driver/esp32/clean.sh; scripts/build/build_examples.py --target esp32-qemu-tests build",
+            "problemMatcher": []
+        },
+        {
+            "label": "Clean esp32-qemu unit tests",
+            "type": "shell",
+            "command": "src/test_driver/esp32/clean.sh",
+            "problemMatcher": []
+        },
+        {
+            "label": "Run esp32-qemu unit tests",
+            "type": "shell",
+            "command": "src/test_driver/esp32/run_qemu_image.py --verbose --file-image-list ./out/esp32-qemu-tests/test_images.txt",
             "problemMatcher": []
         },
         {

src/lib/support/BUILD.gn

@@ -333,6 +333,11 @@ static_library("support") {
   if (chip_config_memory_debug_dmalloc) {
     libs += [ "dmallocthcxx" ]
   }
+
+  if (chip_device_platform == "esp32" || chip_device_platform == "openiotsdk") {
+    # Has non-posix implementation of getopt_long.
+    defines = [ "CONFIG_NON_POSIX_GETOPT_LONG" ]
+  }
 }
 
 source_set("test_utils") {

src/lib/support/CHIPArgParser.hpp

@@ -32,10 +32,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifndef CHIP_CONFIG_NON_POSIX_LONG_OPT
-#define CHIP_CONFIG_NON_POSIX_LONG_OPT 0
-#endif
-
 namespace chip {
 namespace ArgParser {
 

src/lib/support/jsontlv/BUILD.gn

@@ -14,6 +14,7 @@
 
 import("//build_overrides/chip.gni")
 import("//build_overrides/jsoncpp.gni")
+import("${chip_root}/src/platform/device.gni")
 
 config("jsontlv_config") {
 }
@@ -42,4 +43,9 @@ static_library("jsontlv") {
   ]
 
   cflags = [ "-Wconversion" ]
+
+  if (chip_device_platform == "esp32") {
+    # malloc(0) is null on this platform.
+    defines = [ "CONFIG_MALLOC_0_IS_NULL" ]
+  }
 }

src/lib/support/jsontlv/JsonToTlv.cpp

@@ -315,7 +315,13 @@ CHIP_ERROR EncodeTlvElement(const Json::Value & val, TLV::TLVWriter & writer, co
 
         Platform::ScopedMemoryBuffer<uint8_t> byteString;
         byteString.Alloc(BASE64_MAX_DECODED_LEN(static_cast<uint16_t>(encodedLen)));
-        VerifyOrReturnError(byteString.Get() != nullptr, CHIP_ERROR_NO_MEMORY);
+
+        // On a platform where malloc(0) is null (which could be misinterpreted as "out of memory")
+        // we should skip this check if it's a zero-length string.
+#ifdef CONFIG_MALLOC_0_IS_NULL
+        if (encodedLen > 0)
+#endif
+            VerifyOrReturnError(byteString.Get() != nullptr, CHIP_ERROR_NO_MEMORY);
 
         auto decodedLen = Base64Decode(valAsString.c_str(), static_cast<uint16_t>(encodedLen), byteString.Get());
         VerifyOrReturnError(decodedLen < UINT16_MAX, CHIP_ERROR_INVALID_ARGUMENT);

src/test_driver/esp32/CMakeLists.txt

@@ -55,6 +55,7 @@ esp32_unit_test(NAME testMinimalMdnsResponders LIBRARY MinimalMdnsRespondersTest
 esp32_unit_test(NAME testMdns LIBRARY MdnsTests)
 esp32_unit_test(NAME testRetransmit LIBRARY RetransmitTests)
 esp32_unit_test(NAME testSetupPayload LIBRARY SetupPayloadTests)
+esp32_unit_test(NAME testSupport LIBRARY SupportTests)
 esp32_unit_test(NAME testSystemLayer LIBRARY SystemLayerTests)
 esp32_unit_test(NAME testUserDirectedCommissioning LIBRARY UserDirectedCommissioningTests)
 

src/test_driver/esp32/README.md

@@ -58,7 +58,7 @@ To build all unit tests:
     $ source scripts/activate.sh
     $ scripts/build/build_examples.py --target esp32-qemu-tests build
 
-This generates a list of QEMU images in `out/esp32-qemu-tests/`
+This generates a set of QEMU images in `out/esp32-qemu-tests/`
 
 There is one image for each test directory (i.e. each chip_test_suite). So for
 example `src/inet/tests` builds to `out/esp32-qemu-tests/testInetLayer.img`

src/test_driver/esp32/clean.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+#
+# Copyright (c) 2024 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# This script cleans the files generated by building the unit tests.
+#
+
+set -ex
+
+rm -rf out/esp32-qemu-tests src/test_driver/esp32/managed_components src/test_driver/esp32/sdkconfig src/test_driver/esp32/dependencies.lock

src/test_driver/openiotsdk/unit-tests/main/include/CHIPProjectConfig.h

@@ -29,7 +29,6 @@
 
 // Enable support functions for parsing command-line arguments
 #define CHIP_CONFIG_ENABLE_ARG_PARSER 1
-#define CHIP_CONFIG_NON_POSIX_LONG_OPT 1
 
 // Enable building for unit testing
 #define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1