Fix placeholder app shutdown to actually do a clean stack shutdown. (p…

…roject-chip#24714) Otherwise we end up crashing on asserts about leaks. Fixes project-chip#24705
lecndav · Mar 22, 2023 · 24a6b09 · 24a6b09
1 parent 93d9518
commit 24a6b09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/examples/placeholder/linux/include/TestCommand.h b/examples/placeholder/linux/include/TestCommand.h
@@ -56,9 +56,11 @@ class TestCommand : public TestRunner,
     void SetCommandExitStatus(CHIP_ERROR status)
     {
         chip::DeviceLayer::PlatformMgr().StopEventLoopTask();
-        exit(CHIP_NO_ERROR == status ? EXIT_SUCCESS : EXIT_FAILURE);
+        mExitCode = (CHIP_NO_ERROR == status ? EXIT_SUCCESS : EXIT_FAILURE);
     }
 
+    int GetCommandExitCode() { return mExitCode; }
+
     template <typename T>
     size_t AddArgument(const char * name, chip::Optional<T> * value)
     {
@@ -176,6 +178,8 @@ class TestCommand : public TestRunner,
     chip::app::ConcreteAttributePath mAttributePath;
     chip::Optional<chip::NodeId> mCommissionerNodeId;
     chip::Optional<chip::EndpointId> mEndpointId;
+    int mExitCode = EXIT_SUCCESS;
+
     void SetIdentity(const char * name){};
 
     /////////// DelayCommands Interface /////////

diff --git a/examples/placeholder/linux/main.cpp b/examples/placeholder/linux/main.cpp
@@ -41,5 +41,11 @@ int main(int argc, char * argv[])
     }
 
     ChipLinuxAppMainLoop();
+
+    if (test != nullptr)
+    {
+        return test->GetCommandExitCode();
+    }
+
     return 0;
 }