diff --git a/build_all.sh b/build_all.sh index 6fe4402..140eddf 100755 --- a/build_all.sh +++ b/build_all.sh @@ -84,9 +84,9 @@ function build_folders echo "${STARS}" # Build the tests -build_folders test/serial "${TEST_TARGETS}" +build_folders tests/serial "${TEST_TARGETS}" echo "${STARS}" # Build the tests -build_folders test/tcp "${TEST_TARGETS}" +build_folders tests/tcp "${TEST_TARGETS}" echo "${STARS}" diff --git a/test/README.md b/tests/README.md similarity index 100% rename from test/README.md rename to tests/README.md diff --git a/test/mb_example_common/CMakeLists.txt b/tests/mb_example_common/CMakeLists.txt similarity index 100% rename from test/mb_example_common/CMakeLists.txt rename to tests/mb_example_common/CMakeLists.txt diff --git a/test/mb_example_common/README.md b/tests/mb_example_common/README.md similarity index 100% rename from test/mb_example_common/README.md rename to tests/mb_example_common/README.md diff --git a/test/mb_example_common/component.mk b/tests/mb_example_common/component.mk similarity index 100% rename from test/mb_example_common/component.mk rename to tests/mb_example_common/component.mk diff --git a/test/mb_example_common/include/modbus_params.h b/tests/mb_example_common/include/modbus_params.h similarity index 100% rename from test/mb_example_common/include/modbus_params.h rename to tests/mb_example_common/include/modbus_params.h diff --git a/test/mb_example_common/modbus_params.c b/tests/mb_example_common/modbus_params.c similarity index 100% rename from test/mb_example_common/modbus_params.c rename to tests/mb_example_common/modbus_params.c diff --git a/test/serial/mb_serial_master/CMakeLists.txt b/tests/serial/mb_serial_master/CMakeLists.txt similarity index 88% rename from test/serial/mb_serial_master/CMakeLists.txt rename to tests/serial/mb_serial_master/CMakeLists.txt index c4188f9..44b7bf9 100644 --- a/test/serial/mb_serial_master/CMakeLists.txt +++ b/tests/serial/mb_serial_master/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(EXTRA_COMPONENT_DIRS "../../../") -set(EXCLUDE_COMPONENTS examples test_app test freemodbus) +set(EXCLUDE_COMPONENTS examples tests freemodbus) # Include parameters from common modbus folder set(MB_PARAMS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../mb_example_common") diff --git a/test/serial/mb_serial_master/Makefile b/tests/serial/mb_serial_master/Makefile similarity index 84% rename from test/serial/mb_serial_master/Makefile rename to tests/serial/mb_serial_master/Makefile index 1159aea..a58c8b8 100644 --- a/test/serial/mb_serial_master/Makefile +++ b/tests/serial/mb_serial_master/Makefile @@ -7,6 +7,6 @@ PROJECT_NAME := modbus_master EXTRA_COMPONENT_DIRS := ../../../ EXTRA_COMPONENT_DIRS += ../../mb_example_common -EXCLUDE_COMPONENTS := examples test freemodbus +EXCLUDE_COMPONENTS := examples tests freemodbus include $(IDF_PATH)/make/project.mk diff --git a/test/serial/mb_serial_master/README.md b/tests/serial/mb_serial_master/README.md similarity index 100% rename from test/serial/mb_serial_master/README.md rename to tests/serial/mb_serial_master/README.md diff --git a/test/serial/mb_serial_master/main/CMakeLists.txt b/tests/serial/mb_serial_master/main/CMakeLists.txt similarity index 100% rename from test/serial/mb_serial_master/main/CMakeLists.txt rename to tests/serial/mb_serial_master/main/CMakeLists.txt diff --git a/test/serial/mb_serial_master/main/Kconfig.projbuild b/tests/serial/mb_serial_master/main/Kconfig.projbuild similarity index 100% rename from test/serial/mb_serial_master/main/Kconfig.projbuild rename to tests/serial/mb_serial_master/main/Kconfig.projbuild diff --git a/test/serial/mb_serial_master/main/component.mk b/tests/serial/mb_serial_master/main/component.mk similarity index 100% rename from test/serial/mb_serial_master/main/component.mk rename to tests/serial/mb_serial_master/main/component.mk diff --git a/test/serial/mb_serial_master/main/master.c b/tests/serial/mb_serial_master/main/master.c similarity index 100% rename from test/serial/mb_serial_master/main/master.c rename to tests/serial/mb_serial_master/main/master.c diff --git a/test/serial/mb_serial_master/sdkconfig.defaults b/tests/serial/mb_serial_master/sdkconfig.defaults similarity index 100% rename from test/serial/mb_serial_master/sdkconfig.defaults rename to tests/serial/mb_serial_master/sdkconfig.defaults diff --git a/test/serial/mb_serial_slave/CMakeLists.txt b/tests/serial/mb_serial_slave/CMakeLists.txt similarity index 88% rename from test/serial/mb_serial_slave/CMakeLists.txt rename to tests/serial/mb_serial_slave/CMakeLists.txt index f4117d0..1d33508 100644 --- a/test/serial/mb_serial_slave/CMakeLists.txt +++ b/tests/serial/mb_serial_slave/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(EXTRA_COMPONENT_DIRS "../../../") -set(EXCLUDE_COMPONENTS examples test_app test freemodbus) +set(EXCLUDE_COMPONENTS examples tests freemodbus) # Include parameters from common modbus folder set(MB_PARAMS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../mb_example_common") diff --git a/test/serial/mb_serial_slave/Makefile b/tests/serial/mb_serial_slave/Makefile similarity index 84% rename from test/serial/mb_serial_slave/Makefile rename to tests/serial/mb_serial_slave/Makefile index 8abdf51..dce4048 100644 --- a/test/serial/mb_serial_slave/Makefile +++ b/tests/serial/mb_serial_slave/Makefile @@ -7,6 +7,6 @@ PROJECT_NAME := modbus_slave EXTRA_COMPONENT_DIRS := ../../../ EXTRA_COMPONENT_DIRS += ../../mb_example_common -EXCLUDE_COMPONENTS := examples test freemodbus +EXCLUDE_COMPONENTS := examples tests freemodbus include $(IDF_PATH)/make/project.mk diff --git a/test/serial/mb_serial_slave/README.md b/tests/serial/mb_serial_slave/README.md similarity index 100% rename from test/serial/mb_serial_slave/README.md rename to tests/serial/mb_serial_slave/README.md diff --git a/test/serial/mb_serial_slave/main/CMakeLists.txt b/tests/serial/mb_serial_slave/main/CMakeLists.txt similarity index 100% rename from test/serial/mb_serial_slave/main/CMakeLists.txt rename to tests/serial/mb_serial_slave/main/CMakeLists.txt diff --git a/test/serial/mb_serial_slave/main/Kconfig.projbuild b/tests/serial/mb_serial_slave/main/Kconfig.projbuild similarity index 100% rename from test/serial/mb_serial_slave/main/Kconfig.projbuild rename to tests/serial/mb_serial_slave/main/Kconfig.projbuild diff --git a/test/serial/mb_serial_slave/main/component.mk b/tests/serial/mb_serial_slave/main/component.mk similarity index 100% rename from test/serial/mb_serial_slave/main/component.mk rename to tests/serial/mb_serial_slave/main/component.mk diff --git a/test/serial/mb_serial_slave/main/slave.c b/tests/serial/mb_serial_slave/main/slave.c similarity index 100% rename from test/serial/mb_serial_slave/main/slave.c rename to tests/serial/mb_serial_slave/main/slave.c diff --git a/test/serial/mb_serial_slave/sdkconfig.defaults b/tests/serial/mb_serial_slave/sdkconfig.defaults similarity index 100% rename from test/serial/mb_serial_slave/sdkconfig.defaults rename to tests/serial/mb_serial_slave/sdkconfig.defaults diff --git a/test/tcp/mb_tcp_master/CMakeLists.txt b/tests/tcp/mb_tcp_master/CMakeLists.txt similarity index 91% rename from test/tcp/mb_tcp_master/CMakeLists.txt rename to tests/tcp/mb_tcp_master/CMakeLists.txt index 194d5b2..a699565 100644 --- a/test/tcp/mb_tcp_master/CMakeLists.txt +++ b/tests/tcp/mb_tcp_master/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(EXTRA_COMPONENT_DIRS "../../../") -set(EXCLUDE_COMPONENTS examples test_app test freemodbus) +set(EXCLUDE_COMPONENTS examples tests freemodbus) # Include parameters from common modbus folder set(MB_PARAMS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../mb_example_common") diff --git a/test/tcp/mb_tcp_master/Makefile b/tests/tcp/mb_tcp_master/Makefile similarity index 90% rename from test/tcp/mb_tcp_master/Makefile rename to tests/tcp/mb_tcp_master/Makefile index bc15e1a..50f84c2 100644 --- a/test/tcp/mb_tcp_master/Makefile +++ b/tests/tcp/mb_tcp_master/Makefile @@ -8,6 +8,6 @@ PROJECT_NAME := modbus_tcp_master EXTRA_COMPONENT_DIRS := ../../../ EXTRA_COMPONENT_DIRS += ../../mb_example_common EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components/protocol_examples_common -EXCLUDE_COMPONENTS := test freemodbus +EXCLUDE_COMPONENTS := tests freemodbus include $(IDF_PATH)/make/project.mk diff --git a/test/tcp/mb_tcp_master/README.md b/tests/tcp/mb_tcp_master/README.md similarity index 100% rename from test/tcp/mb_tcp_master/README.md rename to tests/tcp/mb_tcp_master/README.md diff --git a/test/tcp/mb_tcp_master/main/CMakeLists.txt b/tests/tcp/mb_tcp_master/main/CMakeLists.txt similarity index 100% rename from test/tcp/mb_tcp_master/main/CMakeLists.txt rename to tests/tcp/mb_tcp_master/main/CMakeLists.txt diff --git a/test/tcp/mb_tcp_master/main/Kconfig.projbuild b/tests/tcp/mb_tcp_master/main/Kconfig.projbuild similarity index 100% rename from test/tcp/mb_tcp_master/main/Kconfig.projbuild rename to tests/tcp/mb_tcp_master/main/Kconfig.projbuild diff --git a/test/tcp/mb_tcp_master/main/component.mk b/tests/tcp/mb_tcp_master/main/component.mk similarity index 100% rename from test/tcp/mb_tcp_master/main/component.mk rename to tests/tcp/mb_tcp_master/main/component.mk diff --git a/test/tcp/mb_tcp_master/main/idf_component.yml b/tests/tcp/mb_tcp_master/main/idf_component.yml similarity index 100% rename from test/tcp/mb_tcp_master/main/idf_component.yml rename to tests/tcp/mb_tcp_master/main/idf_component.yml diff --git a/test/tcp/mb_tcp_master/main/tcp_master.c b/tests/tcp/mb_tcp_master/main/tcp_master.c similarity index 100% rename from test/tcp/mb_tcp_master/main/tcp_master.c rename to tests/tcp/mb_tcp_master/main/tcp_master.c diff --git a/test/tcp/mb_tcp_master/sdkconfig.defaults b/tests/tcp/mb_tcp_master/sdkconfig.defaults similarity index 100% rename from test/tcp/mb_tcp_master/sdkconfig.defaults rename to tests/tcp/mb_tcp_master/sdkconfig.defaults diff --git a/test/tcp/mb_tcp_slave/CMakeLists.txt b/tests/tcp/mb_tcp_slave/CMakeLists.txt similarity index 92% rename from test/tcp/mb_tcp_slave/CMakeLists.txt rename to tests/tcp/mb_tcp_slave/CMakeLists.txt index bdd736e..a0689f3 100644 --- a/test/tcp/mb_tcp_slave/CMakeLists.txt +++ b/tests/tcp/mb_tcp_slave/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(EXTRA_COMPONENT_DIRS "../../../") -set(EXCLUDE_COMPONENTS examples test_app test freemodbus) +set(EXCLUDE_COMPONENTS examples tests freemodbus) # Include parameters from common modbus folder set(MB_PARAMS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../mb_example_common") diff --git a/test/tcp/mb_tcp_slave/Makefile b/tests/tcp/mb_tcp_slave/Makefile similarity index 88% rename from test/tcp/mb_tcp_slave/Makefile rename to tests/tcp/mb_tcp_slave/Makefile index f4b3e9b..8af016a 100644 --- a/test/tcp/mb_tcp_slave/Makefile +++ b/tests/tcp/mb_tcp_slave/Makefile @@ -7,6 +7,6 @@ PROJECT_NAME := modbus_tcp_slave EXTRA_COMPONENT_DIRS := ../../../ EXTRA_COMPONENT_DIRS += ../../mb_example_common EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components/protocol_examples_common -EXCLUDE_COMPONENTS := test freemodbus +EXCLUDE_COMPONENTS := examples tests freemodbus include $(IDF_PATH)/make/project.mk diff --git a/test/tcp/mb_tcp_slave/README.md b/tests/tcp/mb_tcp_slave/README.md similarity index 100% rename from test/tcp/mb_tcp_slave/README.md rename to tests/tcp/mb_tcp_slave/README.md diff --git a/test/tcp/mb_tcp_slave/main/CMakeLists.txt b/tests/tcp/mb_tcp_slave/main/CMakeLists.txt similarity index 100% rename from test/tcp/mb_tcp_slave/main/CMakeLists.txt rename to tests/tcp/mb_tcp_slave/main/CMakeLists.txt diff --git a/test/tcp/mb_tcp_slave/main/Kconfig.projbuild b/tests/tcp/mb_tcp_slave/main/Kconfig.projbuild similarity index 100% rename from test/tcp/mb_tcp_slave/main/Kconfig.projbuild rename to tests/tcp/mb_tcp_slave/main/Kconfig.projbuild diff --git a/test/tcp/mb_tcp_slave/main/component.mk b/tests/tcp/mb_tcp_slave/main/component.mk similarity index 100% rename from test/tcp/mb_tcp_slave/main/component.mk rename to tests/tcp/mb_tcp_slave/main/component.mk diff --git a/test/tcp/mb_tcp_slave/main/idf_component.yml b/tests/tcp/mb_tcp_slave/main/idf_component.yml similarity index 100% rename from test/tcp/mb_tcp_slave/main/idf_component.yml rename to tests/tcp/mb_tcp_slave/main/idf_component.yml diff --git a/test/tcp/mb_tcp_slave/main/tcp_slave.c b/tests/tcp/mb_tcp_slave/main/tcp_slave.c similarity index 100% rename from test/tcp/mb_tcp_slave/main/tcp_slave.c rename to tests/tcp/mb_tcp_slave/main/tcp_slave.c diff --git a/test/tcp/mb_tcp_slave/sdkconfig.defaults b/tests/tcp/mb_tcp_slave/sdkconfig.defaults similarity index 100% rename from test/tcp/mb_tcp_slave/sdkconfig.defaults rename to tests/tcp/mb_tcp_slave/sdkconfig.defaults