From a7498c39e2d34d33a463fc861f1f39f0a626b8da Mon Sep 17 00:00:00 2001 From: Seppo Takalo Date: Mon, 19 Jun 2023 13:16:30 +0300 Subject: [PATCH] tests: net: lwm2m: Remove unnecessary filtering Content-format tests do not require network or Newlibc, so by removing these filters. Defined a native_posix as the only integration platform because all simulated arm-zephyr-eabi platforms are filtered out by Twister. Signed-off-by: Seppo Takalo --- tests/net/lib/lwm2m/block_transfer/testcase.yaml | 10 +++++++--- tests/net/lib/lwm2m/content_json/prj.conf | 2 -- tests/net/lib/lwm2m/content_json/testcase.yaml | 7 ++++--- tests/net/lib/lwm2m/content_link_format/prj.conf | 2 -- tests/net/lib/lwm2m/content_link_format/testcase.yaml | 7 ++++--- tests/net/lib/lwm2m/content_oma_tlv/prj.conf | 2 -- tests/net/lib/lwm2m/content_oma_tlv/testcase.yaml | 7 ++++--- tests/net/lib/lwm2m/content_plain_text/prj.conf | 2 -- tests/net/lib/lwm2m/content_plain_text/testcase.yaml | 7 ++++--- tests/net/lib/lwm2m/content_raw_cbor/prj.conf | 2 -- tests/net/lib/lwm2m/content_raw_cbor/testcase.yaml | 7 ++++--- tests/net/lib/lwm2m/content_senml_cbor/prj.conf | 2 -- tests/net/lib/lwm2m/content_senml_cbor/testcase.yaml | 7 ++++--- tests/net/lib/lwm2m/engine/prj.conf | 1 - tests/net/lib/lwm2m/engine/testcase.yaml | 7 ++++--- tests/net/lib/lwm2m/lwm2m_engine/testcase.yaml | 7 ++++--- tests/net/lib/lwm2m/lwm2m_rd_client/testcase.yaml | 11 +++-------- tests/net/lib/lwm2m/lwm2m_registry/prj.conf | 2 -- tests/net/lib/lwm2m/lwm2m_registry/testcase.yaml | 7 ++++--- 19 files changed, 46 insertions(+), 53 deletions(-) diff --git a/tests/net/lib/lwm2m/block_transfer/testcase.yaml b/tests/net/lib/lwm2m/block_transfer/testcase.yaml index 55a40d517eb..66f145fd18f 100644 --- a/tests/net/lib/lwm2m/block_transfer/testcase.yaml +++ b/tests/net/lib/lwm2m/block_transfer/testcase.yaml @@ -1,5 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.block_transfer: - tags: lwm2m net + platform_key: + - simulation + tags: + - lwm2m + - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/content_json/prj.conf b/tests/net/lib/lwm2m/content_json/prj.conf index 5f99626db5f..3f2cd3e60f2 100644 --- a/tests/net/lib/lwm2m/content_json/prj.conf +++ b/tests/net/lib/lwm2m/content_json/prj.conf @@ -5,8 +5,6 @@ CONFIG_ZTEST_NEW_API=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NEWLIB_LIBC=y - CONFIG_LWM2M=y CONFIG_LWM2M_COAP_MAX_MSG_SIZE=512 CONFIG_LWM2M_RW_JSON_SUPPORT=y diff --git a/tests/net/lib/lwm2m/content_json/testcase.yaml b/tests/net/lib/lwm2m/content_json/testcase.yaml index 2004897b6e2..a283ce908ef 100644 --- a/tests/net/lib/lwm2m/content_json/testcase.yaml +++ b/tests/net/lib/lwm2m/content_json/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.content_json: - filter: TOOLCHAIN_HAS_NEWLIB == 1 + platform_key: + - simulation tags: - lwm2m - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/content_link_format/prj.conf b/tests/net/lib/lwm2m/content_link_format/prj.conf index b70c6003eef..952b54a4566 100644 --- a/tests/net/lib/lwm2m/content_link_format/prj.conf +++ b/tests/net/lib/lwm2m/content_link_format/prj.conf @@ -5,8 +5,6 @@ CONFIG_ZTEST_NEW_API=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NEWLIB_LIBC=y - CONFIG_LWM2M=y CONFIG_LWM2M_RW_JSON_SUPPORT=y CONFIG_JSON_LIBRARY=y diff --git a/tests/net/lib/lwm2m/content_link_format/testcase.yaml b/tests/net/lib/lwm2m/content_link_format/testcase.yaml index c075d55edf3..5448cf68fd0 100644 --- a/tests/net/lib/lwm2m/content_link_format/testcase.yaml +++ b/tests/net/lib/lwm2m/content_link_format/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.content_link_format: - filter: TOOLCHAIN_HAS_NEWLIB == 1 + platform_key: + - simulation tags: - lwm2m - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/content_oma_tlv/prj.conf b/tests/net/lib/lwm2m/content_oma_tlv/prj.conf index 9c9cec3be7c..6041addad83 100644 --- a/tests/net/lib/lwm2m/content_oma_tlv/prj.conf +++ b/tests/net/lib/lwm2m/content_oma_tlv/prj.conf @@ -5,6 +5,4 @@ CONFIG_ZTEST_NEW_API=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NEWLIB_LIBC=y - CONFIG_LWM2M=y diff --git a/tests/net/lib/lwm2m/content_oma_tlv/testcase.yaml b/tests/net/lib/lwm2m/content_oma_tlv/testcase.yaml index 71085888367..2bf877f7353 100644 --- a/tests/net/lib/lwm2m/content_oma_tlv/testcase.yaml +++ b/tests/net/lib/lwm2m/content_oma_tlv/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.content_oma_tlv: - filter: TOOLCHAIN_HAS_NEWLIB == 1 + platform_key: + - simulation tags: - lwm2m - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/content_plain_text/prj.conf b/tests/net/lib/lwm2m/content_plain_text/prj.conf index 9c9cec3be7c..6041addad83 100644 --- a/tests/net/lib/lwm2m/content_plain_text/prj.conf +++ b/tests/net/lib/lwm2m/content_plain_text/prj.conf @@ -5,6 +5,4 @@ CONFIG_ZTEST_NEW_API=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NEWLIB_LIBC=y - CONFIG_LWM2M=y diff --git a/tests/net/lib/lwm2m/content_plain_text/testcase.yaml b/tests/net/lib/lwm2m/content_plain_text/testcase.yaml index cc902805c82..bd70dd790b3 100644 --- a/tests/net/lib/lwm2m/content_plain_text/testcase.yaml +++ b/tests/net/lib/lwm2m/content_plain_text/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.content_plain_text: - filter: TOOLCHAIN_HAS_NEWLIB == 1 + platform_key: + - simulation tags: - lwm2m - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/content_raw_cbor/prj.conf b/tests/net/lib/lwm2m/content_raw_cbor/prj.conf index 0fae8dcbbeb..64ab6f89d22 100644 --- a/tests/net/lib/lwm2m/content_raw_cbor/prj.conf +++ b/tests/net/lib/lwm2m/content_raw_cbor/prj.conf @@ -5,8 +5,6 @@ CONFIG_ZTEST_NEW_API=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NEWLIB_LIBC=y - CONFIG_LWM2M=y CONFIG_LWM2M_VERSION_1_1=y CONFIG_LWM2M_RW_CBOR_SUPPORT=y diff --git a/tests/net/lib/lwm2m/content_raw_cbor/testcase.yaml b/tests/net/lib/lwm2m/content_raw_cbor/testcase.yaml index 13a564aa97d..9fc90f109bc 100644 --- a/tests/net/lib/lwm2m/content_raw_cbor/testcase.yaml +++ b/tests/net/lib/lwm2m/content_raw_cbor/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.content_raw_cbor: - platform_allow: native_posix + platform_key: + - simulation tags: - lwm2m - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/content_senml_cbor/prj.conf b/tests/net/lib/lwm2m/content_senml_cbor/prj.conf index d6bdaceb934..27a8364af58 100644 --- a/tests/net/lib/lwm2m/content_senml_cbor/prj.conf +++ b/tests/net/lib/lwm2m/content_senml_cbor/prj.conf @@ -5,8 +5,6 @@ CONFIG_ZTEST_NEW_API=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NEWLIB_LIBC=y - CONFIG_LWM2M=y CONFIG_LWM2M_VERSION_1_1=y CONFIG_LWM2M_RW_CBOR_SUPPORT=y diff --git a/tests/net/lib/lwm2m/content_senml_cbor/testcase.yaml b/tests/net/lib/lwm2m/content_senml_cbor/testcase.yaml index 4d2db6e5838..55cd89a9f51 100644 --- a/tests/net/lib/lwm2m/content_senml_cbor/testcase.yaml +++ b/tests/net/lib/lwm2m/content_senml_cbor/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.content_senml_cbor: - platform_allow: native_posix + platform_key: + - simulation tags: - lwm2m - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/engine/prj.conf b/tests/net/lib/lwm2m/engine/prj.conf index 18a5df2ad22..4477075056a 100644 --- a/tests/net/lib/lwm2m/engine/prj.conf +++ b/tests/net/lib/lwm2m/engine/prj.conf @@ -5,7 +5,6 @@ CONFIG_ZTEST_NEW_API=y CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NEWLIB_LIBC=y CONFIG_LWM2M=y CONFIG_LWM2M_COAP_MAX_MSG_SIZE=512 diff --git a/tests/net/lib/lwm2m/engine/testcase.yaml b/tests/net/lib/lwm2m/engine/testcase.yaml index 28047c0fa5f..3263441b418 100644 --- a/tests/net/lib/lwm2m/engine/testcase.yaml +++ b/tests/net/lib/lwm2m/engine/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.engine: - platform_allow: native_posix + platform_key: + - simulation tags: - lwm2m - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/lwm2m_engine/testcase.yaml b/tests/net/lib/lwm2m/lwm2m_engine/testcase.yaml index 9f58cafdea4..a7f628405eb 100644 --- a/tests/net/lib/lwm2m/lwm2m_engine/testcase.yaml +++ b/tests/net/lib/lwm2m/lwm2m_engine/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.lwm2m_engine: - platform_allow: native_posix + platform_key: + - simulation tags: - lwm2m - net + integration_platforms: + - native_posix diff --git a/tests/net/lib/lwm2m/lwm2m_rd_client/testcase.yaml b/tests/net/lib/lwm2m/lwm2m_rd_client/testcase.yaml index 7e6415395ca..b5f21f0d9dc 100644 --- a/tests/net/lib/lwm2m/lwm2m_rd_client/testcase.yaml +++ b/tests/net/lib/lwm2m/lwm2m_rd_client/testcase.yaml @@ -1,16 +1,11 @@ common: - depends_on: netif + platform_key: + - simulation tags: - - net - lwm2m - platform_allow: - - native_posix - - qemu_x86 - - qemu_x86_64 + - net integration_platforms: - native_posix - - qemu_x86 - tests: net.lwm2m.lwm2m_rd_client: extra_args: EXTRA_CFLAGS="" diff --git a/tests/net/lib/lwm2m/lwm2m_registry/prj.conf b/tests/net/lib/lwm2m/lwm2m_registry/prj.conf index 1825b4175bc..0b7b9672122 100644 --- a/tests/net/lib/lwm2m/lwm2m_registry/prj.conf +++ b/tests/net/lib/lwm2m/lwm2m_registry/prj.conf @@ -2,10 +2,8 @@ CONFIG_NETWORKING=y CONFIG_NET_TEST=y CONFIG_ZTEST=y CONFIG_ZTEST_NEW_API=y - CONFIG_ENTROPY_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NEWLIB_LIBC=y CONFIG_LWM2M=y CONFIG_LWM2M_COAP_MAX_MSG_SIZE=512 diff --git a/tests/net/lib/lwm2m/lwm2m_registry/testcase.yaml b/tests/net/lib/lwm2m/lwm2m_registry/testcase.yaml index b0fda561cff..ca0f06f58b5 100644 --- a/tests/net/lib/lwm2m/lwm2m_registry/testcase.yaml +++ b/tests/net/lib/lwm2m/lwm2m_registry/testcase.yaml @@ -1,8 +1,9 @@ -common: - depends_on: netif tests: net.lwm2m.lwm2m_registry: + platform_key: + - simulation tags: - lwm2m - net - filter: TOOLCHAIN_HAS_NEWLIB == 1 + integration_platforms: + - native_posix