[ESP32] fix compile error for persistent-storage app (#7940)

* [ESP32] fix compile error for persistent-storage app * add CI for all ESP examples
project-chip · Jul 15, 2021 · 1249507 · 1249507
1 parent 8f8cea2
commit 1249507
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 73 deletions.
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -78,6 +78,38 @@ jobs:
                   mkdir -p example_binaries/$BUILD_TYPE-build
                   cp examples/pigweed-app/esp32/build/chip-pigweed-app.elf \
                      example_binaries/$BUILD_TYPE-build/chip-pigweed-app.elf
+            - name: Build example Lock App
+              timeout-minutes: 5
+              run: scripts/examples/esp_example.sh lock-app
+            - name: Copy aside build products
+              run: |
+                  mkdir -p example_binaries/$BUILD_TYPE-build
+                  cp examples/lock-app/esp32/build/chip-lock-app.elf \
+                     example_binaries/$BUILD_TYPE-build/chip-lock-app.elf
+            - name: Build example Persistent Storage App
+              timeout-minutes: 5
+              run: scripts/examples/esp_example.sh persistent-storage
+            - name: Copy aside build products
+              run: |
+                  mkdir -p example_binaries/$BUILD_TYPE-build
+                  cp examples/persistent-storage/esp32/build/chip-persistent-storage.elf \
+                     example_binaries/$BUILD_TYPE-build/chip-persistent-storage.elf
+            - name: Build example Shell App
+              timeout-minutes: 5
+              run: scripts/examples/esp_example.sh shell
+            - name: Copy aside build products
+              run: |
+                  mkdir -p example_binaries/$BUILD_TYPE-build
+                  cp examples/shell/esp32/build/chip-shell.elf \
+                     example_binaries/$BUILD_TYPE-build/chip-shell.elf
+            - name: Build example Temperature Measurement App
+              timeout-minutes: 15
+              run: scripts/examples/esp_example.sh temperature-measurement-app
+            - name: Copy aside build products
+              run: |
+                  mkdir -p example_binaries/$BUILD_TYPE-build
+                  cp examples/temperature-measurement-app/esp32/build/chip-temperature-measurement-app.elf \
+                     example_binaries/$BUILD_TYPE-build/chip-temperature-measurement-app.elf
             - name: Binary artifact suffix
               id: outsuffix
               uses: haya14busa/[email protected]

diff --git a/examples/persistent-storage/KeyValueStorageTest.cpp b/examples/persistent-storage/KeyValueStorageTest.cpp
@@ -36,7 +36,8 @@ using namespace chip::DeviceLayer::PersistedStorage;
         {                                                                                                                          \
             char error_str[255];                                                                                                   \
             chip::FormatCHIPError(error_str, sizeof(error_str), temp_test_result);                                                 \
-            ChipLogError(NotSpecified, "%s: FAILED %ld [%s]", #test_result, temp_test_result, chip::ErrorStr(temp_test_result));   \
+            ChipLogError(NotSpecified, "%s: FAILED %" PRId32 " [%s]", #test_result, temp_test_result,                              \
+                         chip::ErrorStr(temp_test_result));                                                                        \
         }                                                                                                                          \
         else                                                                                                                       \
         {                                                                                                                          \

diff --git a/examples/persistent-storage/esp32/CMakeLists.txt b/examples/persistent-storage/esp32/CMakeLists.txt
@@ -22,7 +22,7 @@ set(EXTRA_COMPONENT_DIRS
     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
 )
 
-project(persistent-storage)
+project(chip-persistent-storage)
 idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
 

diff --git a/examples/temperature-measurement-app/esp32/sdkconfig_m5stack.defaults b/examples/temperature-measurement-app/esp32/sdkconfig_m5stack.defaults