From dce4293b97927a58725a43d368e61e201a095e53 Mon Sep 17 00:00:00 2001
From: Yufeng Wang <yufengwang@google.com>
Date: Fri, 9 Jul 2021 14:09:13 -0700
Subject: [PATCH] Conduct platform shutdown after RunEventLoop returns (#8255)

---
 src/messaging/tests/echo/common.cpp         |  1 -
 src/messaging/tests/echo/echo_requester.cpp | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/messaging/tests/echo/common.cpp b/src/messaging/tests/echo/common.cpp
index b90877bd298d56..75a4d7d0e391d6 100644
--- a/src/messaging/tests/echo/common.cpp
+++ b/src/messaging/tests/echo/common.cpp
@@ -58,7 +58,6 @@ void InitializeChip(void)
 
 void ShutdownChip(void)
 {
-    chip::DeviceLayer::PlatformMgr().StopEventLoopTask();
     chip::DeviceLayer::PlatformMgr().Shutdown();
     gMessageCounterManager.Shutdown();
     gExchangeManager.Shutdown();
diff --git a/src/messaging/tests/echo/echo_requester.cpp b/src/messaging/tests/echo/echo_requester.cpp
index 08b3a27e09e527..400d69364bb6de 100644
--- a/src/messaging/tests/echo/echo_requester.cpp
+++ b/src/messaging/tests/echo/echo_requester.cpp
@@ -98,12 +98,12 @@ void EchoTimerHandler(chip::System::Layer * systemLayer, void * appState, CHIP_E
         if (err != CHIP_NO_ERROR)
         {
             printf("Send request failed: %s\n", chip::ErrorStr(err));
-            Shutdown();
+            chip::DeviceLayer::PlatformMgr().StopEventLoopTask();
         }
     }
     else
     {
-        Shutdown();
+        chip::DeviceLayer::PlatformMgr().StopEventLoopTask();
     }
 }
 
@@ -276,12 +276,9 @@ int main(int argc, char * argv[])
 
     chip::DeviceLayer::PlatformMgr().RunEventLoop();
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
-        Shutdown();
-    }
+    Shutdown();
 
+exit:
     if ((err != CHIP_NO_ERROR) || (gEchoRespCount != kMaxEchoCount))
     {
         printf("ChipEchoClient failed: %s\n", chip::ErrorStr(err));