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

Remove nlunit-test submodule from repository #34193

Merged
merged 1 commit into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .restyled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**/*"
Expand Down
1 change: 0 additions & 1 deletion config/ameba/chip.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion examples/air-purifier-app/ameba/chip_main.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion examples/all-clusters-app/ameba/chip_main.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion examples/all-clusters-minimal-app/ameba/chip_main.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion examples/chef/ameba/chip_main.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion examples/light-switch-app/ameba/chip_main.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion examples/lighting-app/ameba/chip_main.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion examples/ota-requestor-app/ameba/chip_main.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions scripts/examples/tests/expected_test_cmakelists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ")
Expand Down
3 changes: 1 addition & 2 deletions scripts/examples/tests/test_project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
42 changes: 0 additions & 42 deletions third_party/nlunit-test/BUILD.gn

This file was deleted.

1 change: 0 additions & 1 deletion third_party/nlunit-test/repo
Submodule repo deleted from 0c8c90
Loading