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

Cleanup a few more files that were not recognized by gn #31999

Merged
merged 15 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
5 changes: 0 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ jobs:
--known-failure app/reporting/tests/MockReportScheduler.h \
--known-failure app/server/AppDelegate.h \
--known-failure app/TestEventTriggerDelegate.h \
--known-failure app/tests/integration/common.h \
--known-failure app/tests/integration/MockEvents.h \
--known-failure app/tests/suites/credentials/TestHarnessDACProvider.h \
--known-failure app/tests/TestOperationalDeviceProxy.cpp \
Expand Down Expand Up @@ -163,21 +162,17 @@ jobs:
--known-failure app/util/util.h \
--known-failure app/WriteClient.h \
--known-failure app/WriteHandler.h \
--known-failure inet/tests/TestInetLayerCommon.hpp \
--known-failure lib/core/CHIPVendorIdentifiers.hpp \
--known-failure lib/dnssd/Constants.h \
--known-failure lib/dnssd/minimal_mdns/core/FlatAllocatedQName.h \
--known-failure lib/dnssd/minimal_mdns/core/HeapQName.h \
--known-failure lib/dnssd/minimal_mdns/ListenIterator.h \
--known-failure lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h \
--known-failure lib/dnssd/platform/DnssdBrowseDelegate.h \
--known-failure lib/support/CHIPArgParser.hpp \
--known-failure messaging/tests/echo/common.h \
--known-failure platform/DeviceSafeQueue.cpp \
--known-failure platform/DeviceSafeQueue.h \
--known-failure platform/GLibTypeDeleter.h \
--known-failure platform/SingletonConfigurationManager.cpp \
--known-failure transport/retransmit/tests/TestCacheDriver.cpp \
"

- name: Check for matter lint errors
Expand Down
5 changes: 4 additions & 1 deletion src/app/tests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,10 @@ chip_test_suite_using_nltest("tests") {
if (chip_config_network_layer_ble &&
(chip_device_platform == "linux" || chip_device_platform == "darwin")) {
test_sources += [ "TestCommissionManager.cpp" ]
public_deps += [ "${chip_root}/src/app/server" ]
public_deps += [
"${chip_root}/src/app/server",
"${chip_root}/src/messaging/tests/echo:common",
]
}

if (chip_persist_subscriptions) {
Expand Down
1 change: 1 addition & 0 deletions src/inet/tests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ static_library("helpers") {
"TestInetCommonOptions.h",
"TestInetCommonPosix.cpp",
"TestInetLayerCommon.cpp",
"TestInetLayerCommon.hpp",
"TestSetupSignalling.h",
"TestSetupSignallingPosix.cpp",
]
Expand Down
1 change: 1 addition & 0 deletions src/lib/support/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ static_library("support") {
"BytesToHex.cpp",
"BytesToHex.h",
"CHIPArgParser.cpp",
"CHIPArgParser.hpp",
"CHIPCounter.h",
"CHIPMemString.h",
"CommonIterator.h",
Expand Down
26 changes: 20 additions & 6 deletions src/messaging/tests/echo/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,29 @@ import("${chip_root}/build/chip/tools.gni")

assert(chip_build_tools)

executable("chip-echo-requester") {
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
source_set("common") {
sources = [
"common.cpp",
"echo_requester.cpp",
"common.h",
]

public_deps = [
"${chip_root}/src/crypto",
"${chip_root}/src/lib/core",
"${chip_root}/src/lib/support",
"${chip_root}/src/lib/support:testing",
"${chip_root}/src/messaging",
"${chip_root}/src/platform",
"${chip_root}/src/protocols",
"${chip_root}/src/transport",
]
}

executable("chip-echo-requester") {
sources = [ "echo_requester.cpp" ]

public_deps = [
":common",
"${chip_root}/src/lib/core",
"${chip_root}/src/lib/support",
"${chip_root}/src/platform",
Expand All @@ -37,12 +53,10 @@ executable("chip-echo-requester") {
}

executable("chip-echo-responder") {
sources = [
"common.cpp",
"echo_responder.cpp",
]
sources = [ "echo_responder.cpp" ]

public_deps = [
":common",
"${chip_root}/src/lib/core",
"${chip_root}/src/lib/support",
"${chip_root}/src/platform",
Expand Down
7 changes: 1 addition & 6 deletions src/transport/retransmit/tests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,11 @@ chip_test_suite_using_nltest("tests") {

cflags = [ "-Wconversion" ]

sources = [
"TestCache.cpp",
"TestRetransmit.h",
]
test_sources = [ "TestCache.cpp" ]

public_deps = [
"${chip_root}/src/lib/support:testing_nlunit",
"${chip_root}/src/transport/retransmit",
"${nlunit_test_root}:nlunit-test",
]

tests = [ "TestCache" ]
}
5 changes: 1 addition & 4 deletions src/transport/retransmit/tests/TestCache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "TestRetransmit.h"

#include <lib/support/UnitTestRegistration.h>
#include <transport/retransmit/Cache.h>

Expand Down Expand Up @@ -271,7 +268,7 @@ static const nlTest sTests[] =
};
// clang-format on

int TestCache(void)
int TestCache()
{
nlTestSuite theSuite = { "Retransmit-Cache", &sTests[0], nullptr, nullptr };
gPayloadTracker.Init(&theSuite);
Expand Down
25 changes: 0 additions & 25 deletions src/transport/retransmit/tests/TestCacheDriver.cpp

This file was deleted.

28 changes: 0 additions & 28 deletions src/transport/retransmit/tests/TestRetransmit.h

This file was deleted.

Loading