diff --git a/doc/doxygen.config b/doc/doxygen.config index 6ea9ae68a15..acedd7e7f3f 100644 --- a/doc/doxygen.config +++ b/doc/doxygen.config @@ -106,7 +106,8 @@ INPUT = \ include/arch/nios2/ \ lib/libc/minimal/include/ \ ext/lib/crypto/tinycrypt/include/ \ - lib/iot/zoap/zoap.h \ + include/net/zoap.h \ + include/net/dns_client.h \ tests/ztest/include/ INPUT_ENCODING = UTF-8 FILE_PATTERNS = "*.c" "*.h" "*.S" diff --git a/include/iot/dns_client.h b/include/net/dns_client.h similarity index 100% rename from include/iot/dns_client.h rename to include/net/dns_client.h diff --git a/include/iot/http_parser.h b/include/net/http_parser.h similarity index 100% rename from include/iot/http_parser.h rename to include/net/http_parser.h diff --git a/include/iot/mqtt.h b/include/net/mqtt.h similarity index 99% rename from include/iot/mqtt.h rename to include/net/mqtt.h index b3e36f5919c..112424da539 100644 --- a/include/iot/mqtt.h +++ b/include/net/mqtt.h @@ -17,7 +17,7 @@ #ifndef _MQTT_H_ #define _MQTT_H_ -#include +#include #include /** diff --git a/include/iot/mqtt_types.h b/include/net/mqtt_types.h similarity index 100% rename from include/iot/mqtt_types.h rename to include/net/mqtt_types.h diff --git a/lib/iot/zoap/zoap.h b/include/net/zoap.h similarity index 100% rename from lib/iot/zoap/zoap.h rename to include/net/zoap.h diff --git a/lib/iot/zoap/link-format.h b/include/net/zoap_link_format.h similarity index 100% rename from lib/iot/zoap/link-format.h rename to include/net/zoap_link_format.h diff --git a/lib/Kbuild b/lib/Kbuild index d872e63cb0e..09d3058ef79 100644 --- a/lib/Kbuild +++ b/lib/Kbuild @@ -1,2 +1 @@ obj-y += libc/ -obj-y += iot/ \ No newline at end of file diff --git a/lib/Kconfig b/lib/Kconfig index 56e16aad07c..7f63b91e908 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -19,6 +19,4 @@ menu "Cryptography" source "lib/crypto/tinycrypt/Kconfig" endmenu -source "lib/iot/Kconfig" - source "lib/libc/Kconfig" diff --git a/lib/Makefile b/lib/Makefile index 07dd923c409..e48c8e98a47 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -13,5 +13,3 @@ endif else ZEPHYRINCLUDE += -I$(srctree)/lib/libc/minimal/include endif - -include $(srctree)/lib/iot/Makefile diff --git a/lib/iot/Makefile b/lib/iot/Makefile deleted file mode 100644 index 8b13aea0a66..00000000000 --- a/lib/iot/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -ifdef CONFIG_ZOAP -include $(srctree)/lib/iot/zoap/Makefile -endif - -ifdef CONFIG_DNS_RESOLVER -include $(srctree)/lib/iot/dns/Makefile -endif - -ifdef CONFIG_MQTT_LIB -include $(srctree)/lib/iot/mqtt/Makefile -endif - -ifdef CONFIG_HTTP_PARSER -include $(srctree)/lib/iot/http/Makefile -endif diff --git a/lib/iot/dns/Makefile b/lib/iot/dns/Makefile deleted file mode 100644 index 80428b9e5e4..00000000000 --- a/lib/iot/dns/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y += -I$(srctree)/lib/iot/dns - -obj-y := dns_pack.o -obj-y += dns_client.o - diff --git a/lib/iot/mqtt/Makefile b/lib/iot/mqtt/Makefile deleted file mode 100644 index 9c09f4e6e4c..00000000000 --- a/lib/iot/mqtt/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -obj-y := mqtt_pkt.o -obj-y += mqtt.o diff --git a/lib/iot/zoap/Kbuild b/lib/iot/zoap/Kbuild deleted file mode 100644 index 25650707057..00000000000 --- a/lib/iot/zoap/Kbuild +++ /dev/null @@ -1,4 +0,0 @@ -subdir-ccflags-y +=-I$(srctree)/lib/iot/zoap -ccflags-y += -I${srctree}/net/ip - -obj-y := zoap.o link-format.o diff --git a/lib/iot/zoap/Makefile b/lib/iot/zoap/Makefile deleted file mode 100644 index 64d9ac1231d..00000000000 --- a/lib/iot/zoap/Makefile +++ /dev/null @@ -1 +0,0 @@ -ZEPHYRINCLUDE += -I$(srctree)/lib/iot/zoap diff --git a/samples/net/README b/samples/net/README index 7ad60b5701b..66aa0ba1704 100644 --- a/samples/net/README +++ b/samples/net/README @@ -63,8 +63,8 @@ The number of additional queries is controlled by the DNS_RESOLVER_ADDITIONAL_QUERIES Kconfig variable. For more information about DNS configuration variables, see: -lib/iot/dns/Kconfig. The DNS resolver API can be found at -include/iot/dns_client.h. +subsys/net/lib/dns/Kconfig. The DNS resolver API can be found at +include/net/dns_client.h. Building instructions and sample output can be found at the samples/net/dns_client/README_xxx files. diff --git a/samples/net/dns_client/README_IPv4 b/samples/net/dns_client/README_IPv4 index 758a9ea576f..65b342c4c6f 100644 --- a/samples/net/dns_client/README_IPv4 +++ b/samples/net/dns_client/README_IPv4 @@ -10,7 +10,7 @@ The DNS API allows to recover IPv4 and IPv6 addresses. API Return Codes ================ -API return codes are documented in the API (see include/iot/dns_client.h). +API return codes are documented in the API (see include/net/dns_client.h). Macro | Value | Description ------------------------------------------------------------------------ diff --git a/samples/net/dns_client/src/main.c b/samples/net/dns_client/src/main.c index 710b3050a4f..59409a54c6c 100644 --- a/samples/net/dns_client/src/main.c +++ b/samples/net/dns_client/src/main.c @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/samples/net/leds_demo/src/Makefile b/samples/net/leds_demo/src/Makefile index 7ccdf16ac4f..4fc38badde7 100644 --- a/samples/net/leds_demo/src/Makefile +++ b/samples/net/leds_demo/src/Makefile @@ -5,7 +5,6 @@ ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/ ccflags-y +=-DNET_TESTING_SERVER=1 endif -ccflags-y += -I${ZEPHYR_BASE}/lib/iot/zoap ccflags-$(CONFIG_NET_L2_BLUETOOTH) += -I${ZEPHYR_BASE}/samples/bluetooth/ obj-y = leds-demo.o diff --git a/samples/net/leds_demo/src/leds-demo.c b/samples/net/leds_demo/src/leds-demo.c index 4c5b25c305d..6839c45cab1 100644 --- a/samples/net/leds_demo/src/leds-demo.c +++ b/samples/net/leds_demo/src/leds-demo.c @@ -41,8 +41,8 @@ #include #endif -#include -#include +#include +#include #define MY_COAP_PORT 5683 diff --git a/samples/net/leds_demo/testcase.ini b/samples/net/leds_demo/testcase.ini index 88377047b9a..9deee8c5b5e 100644 --- a/samples/net/leds_demo/testcase.ini +++ b/samples/net/leds_demo/testcase.ini @@ -1,5 +1,5 @@ [test] -tags = net +tags = net zoap build_only = true arch_whitelist = x86 platform_exclude = quark_d2000_crb # not enough RAM diff --git a/samples/net/zoap_client/src/zoap-client.c b/samples/net/zoap_client/src/zoap-client.c index 4bacb8c8c2c..74facff4e3e 100644 --- a/samples/net/zoap_client/src/zoap-client.c +++ b/samples/net/zoap_client/src/zoap-client.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #define MY_COAP_PORT 5683 diff --git a/samples/net/zoap_server/src/Makefile b/samples/net/zoap_server/src/Makefile index 943d307c544..445fdde48d2 100644 --- a/samples/net/zoap_server/src/Makefile +++ b/samples/net/zoap_server/src/Makefile @@ -1,5 +1,3 @@ -ccflags-y += -I${ZEPHYR_BASE}/net/yaip - ifeq ($(CONFIG_NET_TESTING), y) ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/ ccflags-y +=-DNET_TESTING_SERVER=1 diff --git a/samples/net/zoap_server/src/zoap-server.c b/samples/net/zoap_server/src/zoap-server.c index 6cadcf0cb42..22464d05c46 100644 --- a/samples/net/zoap_server/src/zoap-server.c +++ b/samples/net/zoap_server/src/zoap-server.c @@ -25,7 +25,7 @@ #include #include -#include +#include #define MY_COAP_PORT 5683 diff --git a/subsys/net/Kconfig b/subsys/net/Kconfig index a450396bf40..0064e776d1f 100644 --- a/subsys/net/Kconfig +++ b/subsys/net/Kconfig @@ -72,6 +72,8 @@ if NETWORKING source "subsys/net/ip/Kconfig" +source "subsys/net/lib/Kconfig" + endif endmenu diff --git a/subsys/net/Makefile b/subsys/net/Makefile index 0a5b86fb86d..c64bc9f4d0e 100644 --- a/subsys/net/Makefile +++ b/subsys/net/Makefile @@ -6,4 +6,8 @@ obj-y += ip/nbuf.o else obj-y += ip/ endif + endif + +include lib/Makefile +obj-y += lib/ diff --git a/lib/iot/Kbuild b/subsys/net/lib/Kbuild similarity index 100% rename from lib/iot/Kbuild rename to subsys/net/lib/Kbuild diff --git a/lib/iot/Kconfig b/subsys/net/lib/Kconfig similarity index 77% rename from lib/iot/Kconfig rename to subsys/net/lib/Kconfig index 92cc49be0b3..b6858dcc60a 100644 --- a/lib/iot/Kconfig +++ b/subsys/net/lib/Kconfig @@ -14,14 +14,14 @@ # limitations under the License. # -menu "IoT Protocols" +menu "Network Protocols" -source "lib/iot/zoap/Kconfig" +source "subsys/net/lib/zoap/Kconfig" -source "lib/iot/dns/Kconfig" +source "subsys/net/lib/dns/Kconfig" -source "lib/iot/mqtt/Kconfig" +source "subsys/net/lib/mqtt/Kconfig" -source "lib/iot/http/Kconfig" +source "subsys/net/lib/http/Kconfig" endmenu diff --git a/subsys/net/lib/Makefile b/subsys/net/lib/Makefile new file mode 100644 index 00000000000..98b40891c69 --- /dev/null +++ b/subsys/net/lib/Makefile @@ -0,0 +1,15 @@ +ifdef CONFIG_ZOAP +include $(srctree)/subsys/net/lib/zoap/Makefile +endif + +ifdef CONFIG_DNS_RESOLVER +include $(srctree)/subsys/net/lib/dns/Makefile +endif + +ifdef CONFIG_MQTT_LIB +include $(srctree)/subsys/net/lib/mqtt/Makefile +endif + +ifdef CONFIG_HTTP_PARSER +include $(srctree)/subsys/net/lib/http/Makefile +endif diff --git a/lib/iot/dns/Kconfig b/subsys/net/lib/dns/Kconfig similarity index 100% rename from lib/iot/dns/Kconfig rename to subsys/net/lib/dns/Kconfig diff --git a/subsys/net/lib/dns/Makefile b/subsys/net/lib/dns/Makefile new file mode 100644 index 00000000000..af6bce1783e --- /dev/null +++ b/subsys/net/lib/dns/Makefile @@ -0,0 +1,7 @@ +ZEPHYRINCLUDE += -I$(srctree)/subsys/net/lib/dns + +ccflags-y += -I$(srctree)/subsys/net/lib/dns + +obj-y := dns_pack.o +obj-y += dns_client.o + diff --git a/lib/iot/dns/README b/subsys/net/lib/dns/README similarity index 68% rename from lib/iot/dns/README rename to subsys/net/lib/dns/README index 9fa49ea7230..e8dfe7764dd 100644 --- a/lib/iot/dns/README +++ b/subsys/net/lib/dns/README @@ -15,8 +15,4 @@ Usage: Before calling the resolver, it must be initialized via the 'dns_init' routine. -'dnsX_resolve_quick' routines just return the first IP address. -However, domain names may be served by more IP addresses, so -'dnsX_resolve' routines may be more useful. - See samples/net/dns_client/src/main.c. diff --git a/lib/iot/dns/dns_client.c b/subsys/net/lib/dns/dns_client.c similarity index 99% rename from lib/iot/dns/dns_client.c rename to subsys/net/lib/dns/dns_client.c index b9ac5d0413e..b9ca12bb4e5 100644 --- a/lib/iot/dns/dns_client.c +++ b/subsys/net/lib/dns/dns_client.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include "dns_pack.h" #include diff --git a/lib/iot/dns/dns_pack.c b/subsys/net/lib/dns/dns_pack.c similarity index 100% rename from lib/iot/dns/dns_pack.c rename to subsys/net/lib/dns/dns_pack.c diff --git a/lib/iot/dns/dns_pack.h b/subsys/net/lib/dns/dns_pack.h similarity index 100% rename from lib/iot/dns/dns_pack.h rename to subsys/net/lib/dns/dns_pack.h diff --git a/lib/iot/http/Kconfig b/subsys/net/lib/http/Kconfig similarity index 100% rename from lib/iot/http/Kconfig rename to subsys/net/lib/http/Kconfig diff --git a/lib/iot/http/Makefile b/subsys/net/lib/http/Makefile similarity index 100% rename from lib/iot/http/Makefile rename to subsys/net/lib/http/Makefile diff --git a/lib/iot/http/README_http_parser b/subsys/net/lib/http/README_http_parser similarity index 100% rename from lib/iot/http/README_http_parser rename to subsys/net/lib/http/README_http_parser diff --git a/lib/iot/http/http_parser.c b/subsys/net/lib/http/http_parser.c similarity index 99% rename from lib/iot/http/http_parser.c rename to subsys/net/lib/http/http_parser.c index 36a469f8c0e..07139b8ea9e 100644 --- a/lib/iot/http/http_parser.c +++ b/subsys/net/lib/http/http_parser.c @@ -21,7 +21,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include +#include #include #include #include diff --git a/lib/iot/mqtt/Kconfig b/subsys/net/lib/mqtt/Kconfig similarity index 100% rename from lib/iot/mqtt/Kconfig rename to subsys/net/lib/mqtt/Kconfig diff --git a/subsys/net/lib/mqtt/Makefile b/subsys/net/lib/mqtt/Makefile new file mode 100644 index 00000000000..a626aebd6ed --- /dev/null +++ b/subsys/net/lib/mqtt/Makefile @@ -0,0 +1,4 @@ +ZEPHYRINCLUDE += -I$(srctree)/subsys/net/lib/mqtt + +obj-y := mqtt_pkt.o +obj-y += mqtt.o diff --git a/lib/iot/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c similarity index 99% rename from lib/iot/mqtt/mqtt.c rename to subsys/net/lib/mqtt/mqtt.c index 450bab6baa6..8c88edfcb9d 100644 --- a/lib/iot/mqtt/mqtt.c +++ b/subsys/net/lib/mqtt/mqtt.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include "mqtt_pkt.h" #include diff --git a/lib/iot/mqtt/mqtt_pkt.c b/subsys/net/lib/mqtt/mqtt_pkt.c similarity index 100% rename from lib/iot/mqtt/mqtt_pkt.c rename to subsys/net/lib/mqtt/mqtt_pkt.c diff --git a/lib/iot/mqtt/mqtt_pkt.h b/subsys/net/lib/mqtt/mqtt_pkt.h similarity index 99% rename from lib/iot/mqtt/mqtt_pkt.h rename to subsys/net/lib/mqtt/mqtt_pkt.h index 40dd9c1399a..9908009f12a 100644 --- a/lib/iot/mqtt/mqtt_pkt.h +++ b/subsys/net/lib/mqtt/mqtt_pkt.h @@ -30,7 +30,7 @@ #include #include -#include +#include /** * @brief mqtt_pack_connack Packs the MQTT CONNACK message diff --git a/subsys/net/lib/zoap/Kbuild b/subsys/net/lib/zoap/Kbuild new file mode 100644 index 00000000000..45cc83c5cb5 --- /dev/null +++ b/subsys/net/lib/zoap/Kbuild @@ -0,0 +1,4 @@ +subdir-ccflags-y +=-I$(srctree)/subsys/net/lib/zoap +ccflags-y += -I${srctree}/net/ip + +obj-y := zoap.o zoap_link_format.o diff --git a/lib/iot/zoap/Kconfig b/subsys/net/lib/zoap/Kconfig similarity index 100% rename from lib/iot/zoap/Kconfig rename to subsys/net/lib/zoap/Kconfig diff --git a/subsys/net/lib/zoap/Makefile b/subsys/net/lib/zoap/Makefile new file mode 100644 index 00000000000..11202d4d549 --- /dev/null +++ b/subsys/net/lib/zoap/Makefile @@ -0,0 +1 @@ +ZEPHYRINCLUDE += -I$(srctree)/subsys/net/lib/zoap diff --git a/lib/iot/zoap/zoap.c b/subsys/net/lib/zoap/zoap.c similarity index 99% rename from lib/iot/zoap/zoap.c rename to subsys/net/lib/zoap/zoap.c index 8ffdc09e56b..a9443661fdf 100644 --- a/lib/iot/zoap/zoap.c +++ b/subsys/net/lib/zoap/zoap.c @@ -26,7 +26,7 @@ #include #include -#include "zoap.h" +#include struct option_context { uint8_t *buf; diff --git a/lib/iot/zoap/link-format.c b/subsys/net/lib/zoap/zoap_link_format.c similarity index 99% rename from lib/iot/zoap/link-format.c rename to subsys/net/lib/zoap/zoap_link_format.c index b9058683332..37b3a27f993 100644 --- a/lib/iot/zoap/link-format.c +++ b/subsys/net/lib/zoap/zoap_link_format.c @@ -27,8 +27,8 @@ #include -#include "zoap.h" -#include "link-format.h" +#include +#include static int format_uri(const char * const *path, struct net_buf *buf) { diff --git a/tests/iot/test_mqtt_packet/src/Makefile b/tests/iot/test_mqtt_packet/src/Makefile deleted file mode 100644 index 1a377b4ab59..00000000000 --- a/tests/iot/test_mqtt_packet/src/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -ccflags-y += -I$(ZEPHYR_BASE)/lib/iot/mqtt -ccflags-y += -I$(ZEPHYR_BASE)/tests/include - -obj-y = test_mqtt_packet.o diff --git a/tests/iot/test_http_header/Makefile b/tests/net/lib/http_header_fields/Makefile similarity index 100% rename from tests/iot/test_http_header/Makefile rename to tests/net/lib/http_header_fields/Makefile diff --git a/tests/iot/test_http_header/README b/tests/net/lib/http_header_fields/README similarity index 100% rename from tests/iot/test_http_header/README rename to tests/net/lib/http_header_fields/README diff --git a/tests/iot/test_http_header/prj.conf b/tests/net/lib/http_header_fields/prj.conf similarity index 58% rename from tests/iot/test_http_header/prj.conf rename to tests/net/lib/http_header_fields/prj.conf index 2579ed9ad6f..a5305200ccb 100644 --- a/tests/iot/test_http_header/prj.conf +++ b/tests/net/lib/http_header_fields/prj.conf @@ -1,4 +1,7 @@ -# Comment the following line if you want to try another libc +CONFIG_NETWORKING=y +CONFIG_RANDOM_GENERATOR=y +CONFIG_TEST_RANDOM_GENERATOR=y + CONFIG_HTTP_PARSER=y # Enable strict parser by uncommenting the following line # CONFIG_HTTP_PARSER_STRICT=y diff --git a/tests/iot/test_http_header/src/Makefile b/tests/net/lib/http_header_fields/src/Makefile similarity index 95% rename from tests/iot/test_http_header/src/Makefile rename to tests/net/lib/http_header_fields/src/Makefile index 3457bca106e..7a974a6bcd4 100644 --- a/tests/iot/test_http_header/src/Makefile +++ b/tests/net/lib/http_header_fields/src/Makefile @@ -16,4 +16,4 @@ ccflags-y += -I$(ZEPHYR_BASE)/tests/include -obj-y += test_http_header.o +obj-y += http_header_fields.o diff --git a/tests/iot/test_http_header/src/test_http_header.c b/tests/net/lib/http_header_fields/src/http_header_fields.c similarity index 99% rename from tests/iot/test_http_header/src/test_http_header.c rename to tests/net/lib/http_header_fields/src/http_header_fields.c index 5849c44c5ca..f6bd4d45bfc 100644 --- a/tests/iot/test_http_header/src/test_http_header.c +++ b/tests/net/lib/http_header_fields/src/http_header_fields.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include +#include #include #include diff --git a/tests/iot/test_http_header/testcase.ini b/tests/net/lib/http_header_fields/testcase.ini similarity index 61% rename from tests/iot/test_http_header/testcase.ini rename to tests/net/lib/http_header_fields/testcase.ini index 9b6e93b4114..2ea5c681326 100644 --- a/tests/iot/test_http_header/testcase.ini +++ b/tests/net/lib/http_header_fields/testcase.ini @@ -1,3 +1,3 @@ [test] -tags = http iot +tags = http build_only = false diff --git a/tests/iot/test_mqtt_packet/Makefile b/tests/net/lib/mqtt_packet/Makefile similarity index 100% rename from tests/iot/test_mqtt_packet/Makefile rename to tests/net/lib/mqtt_packet/Makefile diff --git a/tests/iot/test_mqtt_packet/README b/tests/net/lib/mqtt_packet/README similarity index 100% rename from tests/iot/test_mqtt_packet/README rename to tests/net/lib/mqtt_packet/README diff --git a/tests/iot/test_mqtt_packet/prj.conf b/tests/net/lib/mqtt_packet/prj.conf similarity index 100% rename from tests/iot/test_mqtt_packet/prj.conf rename to tests/net/lib/mqtt_packet/prj.conf diff --git a/tests/net/lib/mqtt_packet/src/Makefile b/tests/net/lib/mqtt_packet/src/Makefile new file mode 100644 index 00000000000..2a5105218e2 --- /dev/null +++ b/tests/net/lib/mqtt_packet/src/Makefile @@ -0,0 +1,4 @@ +ccflags-y += -I$(ZEPHYR_BASE)/subsys/net/lib/mqtt +ccflags-y += -I$(ZEPHYR_BASE)/tests/include + +obj-y = mqtt_packet.o diff --git a/tests/iot/test_mqtt_packet/src/test_mqtt_packet.c b/tests/net/lib/mqtt_packet/src/mqtt_packet.c similarity index 100% rename from tests/iot/test_mqtt_packet/src/test_mqtt_packet.c rename to tests/net/lib/mqtt_packet/src/mqtt_packet.c diff --git a/tests/iot/test_mqtt_packet/testcase.ini b/tests/net/lib/mqtt_packet/testcase.ini similarity index 86% rename from tests/iot/test_mqtt_packet/testcase.ini rename to tests/net/lib/mqtt_packet/testcase.ini index c3effe83845..96880b93ff0 100644 --- a/tests/iot/test_mqtt_packet/testcase.ini +++ b/tests/net/lib/mqtt_packet/testcase.ini @@ -1,4 +1,4 @@ [test] -tags = mqtt iot +tags = mqtt build_only = false platform_whitelist = qemu_x86 arduino_101 quark_se_c1000_devboard frdm_k64f diff --git a/tests/net/zoap/Makefile b/tests/net/lib/zoap/Makefile similarity index 100% rename from tests/net/zoap/Makefile rename to tests/net/lib/zoap/Makefile diff --git a/tests/net/zoap/prj.conf b/tests/net/lib/zoap/prj.conf similarity index 100% rename from tests/net/zoap/prj.conf rename to tests/net/lib/zoap/prj.conf diff --git a/tests/net/zoap/src/Makefile b/tests/net/lib/zoap/src/Makefile similarity index 100% rename from tests/net/zoap/src/Makefile rename to tests/net/lib/zoap/src/Makefile diff --git a/tests/net/zoap/src/main.c b/tests/net/lib/zoap/src/main.c similarity index 99% rename from tests/net/zoap/src/main.c rename to tests/net/lib/zoap/src/main.c index 5994cbc3710..ad4469db7e9 100644 --- a/tests/net/zoap/src/main.c +++ b/tests/net/lib/zoap/src/main.c @@ -30,7 +30,7 @@ #include -#include +#include #define ZOAP_BUF_SIZE 128 #define ZOAP_LIMITED_BUF_SIZE 13 diff --git a/tests/net/zoap/testcase.ini b/tests/net/lib/zoap/testcase.ini similarity index 100% rename from tests/net/zoap/testcase.ini rename to tests/net/lib/zoap/testcase.ini