Merge branch 'master' into idm-4.2-troubleshoot

Author: raul-marquez-csa

.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"

.github/workflows/tests.yaml

@@ -577,7 +577,6 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
-                  scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_DA_1_2.py'
                   scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
 

.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

.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/**/*"

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(

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)

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)

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)

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(

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)

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)

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

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 ")

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"],