diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8275c9f1164d0a..b55417cdba78ed 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -50,7 +50,6 @@ updates: - dependency-name: "third_party/nlassert/repo" - dependency-name: "third_party/nlfaultinjection/repo" - dependency-name: "third_party/nlio/repo" - - dependency-name: "third_party/nlunit-test/repo" - dependency-name: "third_party/nxp/repo" - dependency-name: "third_party/open-iot-sdk/repo" - dependency-name: "third_party/ot-br-posix/repo" diff --git a/.gitmodules b/.gitmodules index dee55fa9536e7e..a631c773fb76b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,6 @@ path = third_party/nlio/repo url = https://github.com/nestlabs/nlio.git branch = master -[submodule "nlunit-test"] - path = third_party/nlunit-test/repo - url = https://github.com/nestlabs/nlunit-test.git - branch = master [submodule "mbedtls"] path = third_party/mbedtls/repo url = https://github.com/ARMmbed/mbedtls.git diff --git a/.restyled.yaml b/.restyled.yaml index 5e9a492aaaaf41..f55a0e367d91bd 100644 --- a/.restyled.yaml +++ b/.restyled.yaml @@ -55,7 +55,6 @@ exclude: - "third_party/nlassert/repo/**/*" # from here down built with $ awk '/path =/ {print $3 "/**/*"}' .gitmodules - "third_party/nlfaultinjection/repo/**/*" - "third_party/nlio/repo/**/*" - - "third_party/nlunit-test/repo/**/*" - "third_party/mbedtls/repo/**/*" - "examples/common/QRCode/repo/**/*" - "examples/common/m5stack-tft/repo/**/*" diff --git a/config/ameba/chip.cmake b/config/ameba/chip.cmake index d221ab57352f94..47444055f66733 100644 --- a/config/ameba/chip.cmake +++ b/config/ameba/chip.cmake @@ -63,7 +63,6 @@ list( ${CHIP_ROOT}/src/app ${CHIP_ROOT}/third_party/nlassert/repo/include ${CHIP_ROOT}/third_party/nlio/repo/include - ${CHIP_ROOT}/third_party/nlunit-test/repo/src ) execute_process( diff --git a/examples/air-purifier-app/ameba/chip_main.cmake b/examples/air-purifier-app/ameba/chip_main.cmake index df900f2508de17..c2a8d0e928fa0c 100755 --- a/examples/air-purifier-app/ameba/chip_main.cmake +++ b/examples/air-purifier-app/ameba/chip_main.cmake @@ -204,7 +204,6 @@ target_include_directories( ${chip_dir}/src/app/server/ ${chip_dir}/src/controller/data_model ${chip_dir}/third_party/nlio/repo/include/ - ${chip_dir}/third_party/nlunit-test/repo/src ) if (matter_enable_rpc) diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake index 2afdd4e8d70942..00358771e5adbf 100755 --- a/examples/all-clusters-app/ameba/chip_main.cmake +++ b/examples/all-clusters-app/ameba/chip_main.cmake @@ -254,7 +254,6 @@ target_include_directories( ${chip_dir}/src/app/server/ ${chip_dir}/src/controller/data_model ${chip_dir}/third_party/nlio/repo/include/ - ${chip_dir}/third_party/nlunit-test/repo/src ) if (matter_enable_rpc) diff --git a/examples/all-clusters-minimal-app/ameba/chip_main.cmake b/examples/all-clusters-minimal-app/ameba/chip_main.cmake index acd5032e661fbf..e8fa8393ddeb1c 100755 --- a/examples/all-clusters-minimal-app/ameba/chip_main.cmake +++ b/examples/all-clusters-minimal-app/ameba/chip_main.cmake @@ -187,7 +187,6 @@ target_include_directories( ${chip_dir}/src/app/server/ ${chip_dir}/src/controller/data_model ${chip_dir}/third_party/nlio/repo/include/ - ${chip_dir}/third_party/nlunit-test/repo/src ) if (matter_enable_rpc) diff --git a/examples/chef/ameba/chip_main.cmake b/examples/chef/ameba/chip_main.cmake index de17e0534cb7cd..df9f7fedd10ecc 100755 --- a/examples/chef/ameba/chip_main.cmake +++ b/examples/chef/ameba/chip_main.cmake @@ -78,7 +78,6 @@ target_include_directories( ${chip_dir}/src/app/server/ ${chip_dir}/src/controller/data_model ${chip_dir}/third_party/nlio/repo/include/ - ${chip_dir}/third_party/nlunit-test/repo/src ) list( diff --git a/examples/light-switch-app/ameba/chip_main.cmake b/examples/light-switch-app/ameba/chip_main.cmake index 78f3c8c755f488..75e0d0116425fe 100755 --- a/examples/light-switch-app/ameba/chip_main.cmake +++ b/examples/light-switch-app/ameba/chip_main.cmake @@ -213,7 +213,6 @@ target_include_directories( ${chip_dir}/src/app/server/ ${chip_dir}/src/controller/data_model ${chip_dir}/third_party/nlio/repo/include/ - ${chip_dir}/third_party/nlunit-test/repo/src ) if (matter_enable_rpc) diff --git a/examples/lighting-app/ameba/chip_main.cmake b/examples/lighting-app/ameba/chip_main.cmake index 146ba5dbe934e7..3165047d3955be 100755 --- a/examples/lighting-app/ameba/chip_main.cmake +++ b/examples/lighting-app/ameba/chip_main.cmake @@ -208,7 +208,6 @@ target_include_directories( ${chip_dir}/src/app/server/ ${chip_dir}/src/controller/data_model ${chip_dir}/third_party/nlio/repo/include/ - ${chip_dir}/third_party/nlunit-test/repo/src ) if (matter_enable_rpc) diff --git a/examples/ota-requestor-app/ameba/chip_main.cmake b/examples/ota-requestor-app/ameba/chip_main.cmake index cffc1339536d53..1a418260dbb294 100644 --- a/examples/ota-requestor-app/ameba/chip_main.cmake +++ b/examples/ota-requestor-app/ameba/chip_main.cmake @@ -60,7 +60,6 @@ target_include_directories( ${chip_dir}/src/app/server/ ${chip_dir}/src/controller/data_model ${chip_dir}/third_party/nlio/repo/include/ - ${chip_dir}/third_party/nlunit-test/repo/src ${chip_dir}/src/app/clusters/ota-requestor ${chip_dir}/examples/ota-requestor-app/ameba/main/include ${chip_dir}/examples/platform/ameba diff --git a/scripts/examples/tests/expected_test_cmakelists.txt b/scripts/examples/tests/expected_test_cmakelists.txt index e8e2d3f2737bfb..cf615cd42e0005 100644 --- a/scripts/examples/tests/expected_test_cmakelists.txt +++ b/scripts/examples/tests/expected_test_cmakelists.txt @@ -70,8 +70,7 @@ set_property(TARGET "${target}" APPEND PROPERTY INCLUDE_DIRECTORIES "//TEST_ROOT_PATH/config/standalone/" "//TEST_ROOT_PATH/third_party/nlassert/repo/include/" "//TEST_ROOT_PATH/third_party/nlio/repo/include/" - "//TEST_ROOT_PATH/third_party/nlfaultinjection/include/" - "//TEST_ROOT_PATH/third_party/nlunit-test/repo/src/") + "//TEST_ROOT_PATH/third_party/nlfaultinjection/include/") set_target_properties("${target}" PROPERTIES COMPILE_DEFINITIONS "CHIP_HAVE_CONFIG_H=1;") set_target_properties("${target}" PROPERTIES COMPILE_FLAGS "-O0 -std=gnu++14 -fno-rtti ") set_target_properties("${target}" PROPERTIES LINK_FLAGS "-O0 ") diff --git a/scripts/examples/tests/test_project.json b/scripts/examples/tests/test_project.json index d15f2abd9e2ce8..2f13899deed5ca 100644 --- a/scripts/examples/tests/test_project.json +++ b/scripts/examples/tests/test_project.json @@ -88,8 +88,7 @@ "//config/standalone/", "//third_party/nlassert/repo/include/", "//third_party/nlio/repo/include/", - "//third_party/nlfaultinjection/include/", - "//third_party/nlunit-test/repo/src/" + "//third_party/nlfaultinjection/include/" ], "ldflags": ["-march=armv8-a", "-O0"], "libs": ["log"], diff --git a/third_party/nlunit-test/BUILD.gn b/third_party/nlunit-test/BUILD.gn deleted file mode 100644 index f56d0a5e9d2cb5..00000000000000 --- a/third_party/nlunit-test/BUILD.gn +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) 2020 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build_overrides/build.gni") -import("${build_root}/config/compiler/compiler.gni") - -config("nlunit-test_config") { - include_dirs = [ "repo/src" ] -} - -config("nlunit-test_config_disable_warnings") { - cflags = [ "-Wno-conversion" ] - - if (is_clang) { - cflags += [ "-Wno-shorten-64-to-32" ] - } -} - -static_library("nlunit-test") { - output_name = "libnlunit-test" - - output_dir = "${root_out_dir}/lib" - - sources = [ - "repo/src/nlunit-test.c", - "repo/src/nlunit-test.h", - ] - - public_configs = [ ":nlunit-test_config" ] - configs += [ ":nlunit-test_config_disable_warnings" ] -} diff --git a/third_party/nlunit-test/repo b/third_party/nlunit-test/repo deleted file mode 160000 index 0c8c9073af9c07..00000000000000 --- a/third_party/nlunit-test/repo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c8c9073af9c07aa089861295b7d7ced56ad174d