Merge pull request #291 from espressif/bugfix/catch2_build_failure

fix(catch2): fix missing structure initializer warning
espressif · Jan 10, 2024 · a5a8f17 · a5a8f17
2 parents 22e2825 + 9280cbe
commit a5a8f17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/catch2/cmd_catch2.cpp b/catch2/cmd_catch2.cpp
@@ -21,13 +21,10 @@ static int cmd_catch2(int argc, char **argv)
 
 extern "C" esp_err_t register_catch2(const char *cmd_name)
 {
-    const esp_console_cmd_t cmd = {
-        .command = cmd_name,
-        .help = "Run tests",
-        .hint = NULL,
-        .func = &cmd_catch2,
-        .argtable = NULL
-    };
+    esp_console_cmd_t cmd = {};
+    cmd.command = cmd_name,
+    cmd.help = "Run tests";
+    cmd.func = &cmd_catch2;
     return esp_console_cmd_register(&cmd);
 }
 

diff --git a/catch2/examples/catch2-console/sdkconfig.defaults b/catch2/examples/catch2-console/sdkconfig.defaults
@@ -1 +1,2 @@
 CONFIG_COMPILER_CXX_EXCEPTIONS=y
+CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
diff --git a/catch2/idf_component.yml b/catch2/idf_component.yml
@@ -1,4 +1,4 @@
-version: "3.4.0~3"
+version: "3.4.0~4"
 description: A modern, C++-native, test framework for unit-tests, TDD and BDD - using C++14, C++17 and later
 url: https://github.com/espressif/idf-extra-components/tree/master/catch2
 repository: https://github.com/espressif/idf-extra-components.git
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		CONFIG_COMPILER_CXX_EXCEPTIONS=y
		CONFIG_ESP_CONSOLE_SECONDARY_NONE=y