From 23292826792529279768e2dc5dd526a20dac9821 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Wed, 11 May 2022 21:42:23 +0200 Subject: [PATCH] Remove chip_enable_group_messaging_tests option (#18338) --- .github/workflows/fuzzing-build.yaml | 2 +- .github/workflows/tests.yaml | 4 ++-- scripts/build/build/targets.py | 2 -- scripts/build/builders/host.py | 6 +----- src/app/server/BUILD.gn | 10 ---------- src/app/tests/suites/TestGroupMessaging.yaml | 2 -- 6 files changed, 4 insertions(+), 22 deletions(-) diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index ff8213066d1642..8b7c5593b68aeb 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -66,7 +66,7 @@ jobs: run: | ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py \ - --target linux-x64-all-clusters-no-ble-libfuzzer-test-group \ + --target linux-x64-all-clusters-no-ble-libfuzzer \ build \ --copy-artifacts-to objdir-clone \ " diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 586ac52c89e0ac..4d8059094900cd 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -81,7 +81,7 @@ jobs: ./scripts/run_in_build_env.sh \ "./scripts/build/build_examples.py \ --target linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \ - --target linux-x64-all-clusters-test-group-${BUILD_VARIANT} \ + --target linux-x64-all-clusters-${BUILD_VARIANT} \ --target linux-x64-lock-${BUILD_VARIANT} \ --target linux-x64-tv-app-${BUILD_VARIANT} \ build \ @@ -95,7 +95,7 @@ jobs: --chip-tool ./out/linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \ run \ --iterations 1 \ - --all-clusters-app ./out/linux-x64-all-clusters-test-group-${BUILD_VARIANT}/chip-all-clusters-app \ + --all-clusters-app ./out/linux-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \ --lock-app ./out/linux-x64-lock-${BUILD_VARIANT}/chip-lock-app \ --tv-app ./out/linux-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \ " diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 768469f030d663..da0d39837ceb7e 100644 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -258,8 +258,6 @@ def HostTargets(): # Possible build variants. Note that number of potential # builds is exponential here - builder.AppendVariant(name="test-group", validator=AcceptNameWithSubstrings( - ['-all-clusters', '-chip-tool']), test_group=True), builder.AppendVariant(name="same-event-loop", validator=AcceptNameWithSubstrings( ['-chip-tool', '-chip-tool-darwin']), separate_event_loop=False), builder.AppendVariant(name="no-interactive", validator=AcceptNameWithSubstrings( diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py index 196ae303a2265b..db7fbf18c5d64e 100644 --- a/scripts/build/builders/host.py +++ b/scripts/build/builders/host.py @@ -164,7 +164,7 @@ class HostBuilder(GnBuilder): def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE, enable_ipv4=True, enable_ble=True, enable_wifi=True, use_tsan=False, use_asan=False, separate_event_loop=True, - test_group=False, use_libfuzzer=False, use_clang=False, interactive_mode=True, extra_tests=False, + use_libfuzzer=False, use_clang=False, interactive_mode=True, extra_tests=False, use_platform_mdns=False): super(HostBuilder, self).__init__( root=os.path.join(root, 'examples', app.ExamplePath()), @@ -195,10 +195,6 @@ def __init__(self, root, runner, app: HostApp, board=HostBoard.NATIVE, enable_ip if not interactive_mode: self.extra_gn_options.append('config_use_interactive_mode=false') - if test_group: - self.extra_gn_options.append( - 'chip_enable_group_messaging_tests=true') - if use_libfuzzer: self.extra_gn_options.append('is_libfuzzer=true') diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn index 66dc5dc95b8e87..d77162909ee5e6 100644 --- a/src/app/server/BUILD.gn +++ b/src/app/server/BUILD.gn @@ -15,22 +15,12 @@ import("//build_overrides/chip.gni") import("${chip_root}/src/app/common_flags.gni") -# Move this inside the GroupDataProvider once implemented Issue #11075 -declare_args() { - #Enable Multicast listenening on HardCoded IPV6 address for Test suite - chip_enable_group_messaging_tests = false -} - config("server_config") { defines = [] if (chip_app_use_echo) { defines += [ "CHIP_APP_USE_ECHO" ] } - - if (chip_enable_group_messaging_tests) { - defines += [ "CHIP_ENABLE_GROUP_MESSAGING_TESTS" ] - } } static_library("server") { diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml index da06d8d7224703..54f6e5d2343a21 100644 --- a/src/app/tests/suites/TestGroupMessaging.yaml +++ b/src/app/tests/suites/TestGroupMessaging.yaml @@ -16,8 +16,6 @@ # This test file tests Group Multicast Messaging. # For this test to work, A Group Write/Command and a unicast read need to occur to be able to confirm that the group Communication works. Every test comes in a pair # Only Works on Linux machines -# When building chip-tool, chip_enable_group_messaging_tests needs to be set to true in the build command for the test to pass -# ./scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/standalone/ chip_config_network_layer_ble=false is_tsan=true chip_enable_group_messaging_tests=true name: Basic Group Messaging Tests config: