Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tests] Improving initalizaiton in TestInetCommonPosix #26663

Merged
merged 1 commit into from
May 25, 2023
Merged

[Tests] Improving initalizaiton in TestInetCommonPosix #26663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/inet/tests/TestInetCommonPosix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,20 +161,31 @@ void ShutdownTestInetCommon()

void InitSystemLayer()
{
#if CHIP_SYSTEM_CONFIG_USE_LWIP && !(CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT)
#if CHIP_SYSTEM_CONFIG_USE_LWIP
// LwIP implementation uses the event loop for servicing events.
// The CHIP stack initialization is required then.
chip::DeviceLayer::PlatformMgr().InitChipStack();
#ifndef CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT
AcquireLwIP();
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP && !(CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT)
#endif // !CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP

gSystemLayer.Init();
}

void ShutdownSystemLayer()
{

gSystemLayer.Shutdown();

#if CHIP_SYSTEM_CONFIG_USE_LWIP && !(CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT)
#if CHIP_SYSTEM_CONFIG_USE_LWIP
// LwIP implementation uses the event loop for servicing events.
// The CHIP stack shutdown is required then.
chip::DeviceLayer::PlatformMgr().Shutdown();
#ifndef CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT
ReleaseLwIP();
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP && !(CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT)
#endif // !CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
}

#if CHIP_SYSTEM_CONFIG_USE_LWIP && !(CHIP_SYSTEM_CONFIG_LWIP_SKIP_INIT)
Expand Down
3 changes: 1 addition & 2 deletions src/transport/raw/tests/NetworkTestHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ CHIP_ERROR IOContext::Init()
CHIP_ERROR err = Platform::MemoryInit();
chip::DeviceLayer::SetConfigurationMgr(&chip::DeviceLayer::ConfigurationMgrImpl());

gSystemLayer.Init();

InitSystemLayer();
InitNetwork();

mSystemLayer = &gSystemLayer;
Expand Down