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.

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

Update TestMessageCounterSyncMgr with the latest API change for NewPa… #4913

Merged
merged 1 commit into from
Feb 17, 2021
Merged

Update TestMessageCounterSyncMgr with the latest API change for NewPa… #4913

merged 1 commit into from
Feb 17, 2021

Conversation

yufengwangca
Copy link
Contributor

…iring

Problem

NewPairing APIs changed with #4885, which cause conflict with #4712 Implement Message Counter Synchronization Protocol part

Summary of Changes

Update TestMessageCounterSyncMgr with the latest API change.

Copy link
Contributor

@LuDuda LuDuda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two more functions to align (lines 198, 204).

@msandstedt
Copy link
Contributor

I still see breakages here:

michaelsandstedt@MN-MSANDSTEDT-M:~/connectedhomeip$ ninja -C out
ninja: Entering directory `out'
[0/1] Regenerating ninja files
[3/80] c++ obj/src/messaging/tests/libMessagingLayerTests.TestMessageCounterSyncMgr.cpp.o
FAILED: obj/src/messaging/tests/libMessagingLayerTests.TestMessageCounterSyncMgr.cpp.o
g++ -MMD -MF obj/src/messaging/tests/libMessagingLayerTests.TestMessageCounterSyncMgr.cpp.o.d -Wconversion -O0 -g2 -fno-common -ffunction-sections -fdata-sections -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -Wall -Wextra -Wshadow -Werror -Wno-deprecated-declarations -Wno-unknown-warning-option -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wno-cast-function-type -fdiagnostics-color -fno-strict-aliasing -I/usr/local/Cellar/[email protected]/1.1.1i/include -std=gnu++14 -fno-rtti -Wnon-virtual-dtor -DCHIP_HAVE_CONFIG_H=1 -DCHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=true -DLWIP_IPV4=1 -DLWIP_IPV6=1 -DLWIP_API=1 -DLWIP_ETHERNET=1 -DLWIP_SLIP=0 -DLWIP_6LOWPAN=1 -DLWIP_PPP=1 -I../src/include -I../src -Igen/include -I../config/standalone -I../src/lib -I../third_party/nlassert/repo/include -I../third_party/nlio/repo/include -I../third_party/nlfaultinjection/repo/include -I../src/lwip/standalone -I../third_party/lwip/repo/lwip/src/include -I../src/lwip/include -I../third_party/nlunit-test/repo/src -I../src/setup_payload -c ../src/messaging/tests/TestMessageCounterSyncMgr.cpp -o obj/src/messaging/tests/libMessagingLayerTests.TestMessageCounterSyncMgr.cpp.o
../src/messaging/tests/TestMessageCounterSyncMgr.cpp:198:100: error: too few arguments to function call, expected at least 5, have 4
    err = ctx.GetSecureSessionManager().NewPairing(peer, kDestinationNodeId, &pairingLocalToPeer, 0);
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                                 ^
../src/transport/SecureSessionMgr.h:252:5: note: 'NewPairing' declared here
    CHIP_ERROR NewPairing(const Optional<Transport::PeerAddress> & peerAddr, NodeId peerNodeId, PASESession * pairing,
    ^
../src/messaging/tests/TestMessageCounterSyncMgr.cpp:204:95: error: too few arguments to function call, expected at least 5, have 4
    err = ctx.GetSecureSessionManager().NewPairing(peer, kSourceNodeId, &pairingPeerToLocal, 1);
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                            ^
../src/transport/SecureSessionMgr.h:252:5: note: 'NewPairing' declared here
    CHIP_ERROR NewPairing(const Optional<Transport::PeerAddress> & peerAddr, NodeId peerNodeId, PASESession * pairing,
    ^
2 errors generated.
[16/80] c++ obj/src/app/libCHIPDataModel.CommandHandler.cpp.o
ninja: build stopped: subcommand failed.

@yufengwangca
Copy link
Contributor Author

I still see breakages here:

michaelsandstedt@MN-MSANDSTEDT-M:~/connectedhomeip$ ninja -C out
ninja: Entering directory `out'
[0/1] Regenerating ninja files
[3/80] c++ obj/src/messaging/tests/libMessagingLayerTests.TestMessageCounterSyncMgr.cpp.o
FAILED: obj/src/messaging/tests/libMessagingLayerTests.TestMessageCounterSyncMgr.cpp.o
g++ -MMD -MF obj/src/messaging/tests/libMessagingLayerTests.TestMessageCounterSyncMgr.cpp.o.d -Wconversion -O0 -g2 -fno-common -ffunction-sections -fdata-sections -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -Wall -Wextra -Wshadow -Werror -Wno-deprecated-declarations -Wno-unknown-warning-option -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wno-cast-function-type -fdiagnostics-color -fno-strict-aliasing -I/usr/local/Cellar/[email protected]/1.1.1i/include -std=gnu++14 -fno-rtti -Wnon-virtual-dtor -DCHIP_HAVE_CONFIG_H=1 -DCHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE=true -DLWIP_IPV4=1 -DLWIP_IPV6=1 -DLWIP_API=1 -DLWIP_ETHERNET=1 -DLWIP_SLIP=0 -DLWIP_6LOWPAN=1 -DLWIP_PPP=1 -I../src/include -I../src -Igen/include -I../config/standalone -I../src/lib -I../third_party/nlassert/repo/include -I../third_party/nlio/repo/include -I../third_party/nlfaultinjection/repo/include -I../src/lwip/standalone -I../third_party/lwip/repo/lwip/src/include -I../src/lwip/include -I../third_party/nlunit-test/repo/src -I../src/setup_payload -c ../src/messaging/tests/TestMessageCounterSyncMgr.cpp -o obj/src/messaging/tests/libMessagingLayerTests.TestMessageCounterSyncMgr.cpp.o
../src/messaging/tests/TestMessageCounterSyncMgr.cpp:198:100: error: too few arguments to function call, expected at least 5, have 4
    err = ctx.GetSecureSessionManager().NewPairing(peer, kDestinationNodeId, &pairingLocalToPeer, 0);
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                                 ^
../src/transport/SecureSessionMgr.h:252:5: note: 'NewPairing' declared here
    CHIP_ERROR NewPairing(const Optional<Transport::PeerAddress> & peerAddr, NodeId peerNodeId, PASESession * pairing,
    ^
../src/messaging/tests/TestMessageCounterSyncMgr.cpp:204:95: error: too few arguments to function call, expected at least 5, have 4
    err = ctx.GetSecureSessionManager().NewPairing(peer, kSourceNodeId, &pairingPeerToLocal, 1);
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                            ^
../src/transport/SecureSessionMgr.h:252:5: note: 'NewPairing' declared here
    CHIP_ERROR NewPairing(const Optional<Transport::PeerAddress> & peerAddr, NodeId peerNodeId, PASESession * pairing,
    ^
2 errors generated.
[16/80] c++ obj/src/app/libCHIPDataModel.CommandHandler.cpp.o
ninja: build stopped: subcommand failed.

There are another two places to align, updated.

@bzbarsky-apple bzbarsky-apple added the hotfix urgent fix needed, can bypass review label Feb 17, 2021
@mspang mspang merged commit cab273e into project-chip:master Feb 17, 2021
@yufengwangca yufengwangca deleted the pr/build/ci branch February 17, 2021 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotfix urgent fix needed, can bypass review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants