[nrf fromtree] 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 <seppo.takalo@nordicsemi.no> (cherry picked from commit a7498c3)
nrfconnect · Aug 3, 2023 · c9d01d0 · c9d01d0
1 parent 8cb6e03
commit c9d01d0
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 53 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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