riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: Update to new EXTERNAL_MODULE_DIRS interface

Browse Source
This commit is contained in:
Marian Buschsieweke 2021-03-02 15:11:53 +01:00
parent ef5ec6d038
commit 81411e3539
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
43 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cpp_exclude/Makefile
View File

@ -3,6 +3,6 @@ include ../Makefile.tests_common
FEATURES_REQUIRED += cpp libstdcpp FEATURES_REQUIRED += cpp libstdcpp
USEMODULE += module_exclude USEMODULE += module_exclude
EXTERNAL_MODULE_DIRS += $(CURDIR)/module_exclude EXTERNAL_MODULE_DIRS += external_modules
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

0
tests/cpp_exclude/module_exclude/Makefile → tests/cpp_exclude/external_modules/module_exclude/Makefile
View File

0
tests/cpp_exclude/module_exclude/Makefile.dep → tests/cpp_exclude/external_modules/module_exclude/Makefile.dep
View File

0
tests/cpp_exclude/module_exclude/Makefile.include → tests/cpp_exclude/external_modules/module_exclude/Makefile.include
View File

0
tests/cpp_exclude/module_exclude/module.cpp → tests/cpp_exclude/external_modules/module_exclude/module.cpp
View File

0
tests/cpp_exclude/module_exclude/module.hpp → tests/cpp_exclude/external_modules/module_exclude/module.hpp
View File

0
tests/cpp_exclude/module_exclude/module_excluded.cpp → tests/cpp_exclude/external_modules/module_exclude/module_excluded.cpp
View File

2
tests/cpp_ext/Makefile
View File

@ -3,6 +3,6 @@ include ../Makefile.tests_common
FEATURES_REQUIRED += cpp libstdcpp FEATURES_REQUIRED += cpp libstdcpp
USEMODULE += module USEMODULE += module
EXTERNAL_MODULE_DIRS += $(CURDIR)/module EXTERNAL_MODULE_DIRS += external_modules
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

0
tests/cpp_ext/module/Makefile → tests/cpp_ext/external_modules/module/Makefile
View File

0
tests/cpp_ext/module/Makefile.dep → tests/cpp_ext/external_modules/module/Makefile.dep
View File

0
tests/cpp_ext/module/Makefile.include → tests/cpp_ext/external_modules/module/Makefile.include
View File

0
tests/cpp_ext/module/module.cc → tests/cpp_ext/external_modules/module/module.cc
View File

0
tests/cpp_ext/module/module.cpp → tests/cpp_ext/external_modules/module/module.cpp
View File

0
tests/cpp_ext/module/module.hh → tests/cpp_ext/external_modules/module/module.hh
View File

3
tests/kconfig/Makefile
View File

@ -2,7 +2,6 @@ include ../Makefile.tests_common
USEMODULE += external_module_1 USEMODULE += external_module_1
USEMODULE += external_module_2 USEMODULE += external_module_2
EXTERNAL_MODULE_DIRS += $(CURDIR)/external_module_1 EXTERNAL_MODULE_DIRS += external_modules
EXTERNAL_MODULE_DIRS += $(CURDIR)/external_module_2
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

0
tests/kconfig/external_module_1/Kconfig → tests/kconfig/external_modules/external_module_1/Kconfig
View File

0
tests/kconfig/external_module_1/Makefile → tests/kconfig/external_modules/external_module_1/Makefile
View File

0
tests/kconfig/external_module_1/Makefile.include → tests/kconfig/external_modules/external_module_1/Makefile.include
View File

0
tests/kconfig/external_module_1/include/external_module_1.h → tests/kconfig/external_modules/external_module_1/include/external_module_1.h
View File

0
tests/kconfig/external_module_2/Kconfig → tests/kconfig/external_modules/external_module_2/Kconfig
View File

0
tests/kconfig/external_module_2/Makefile → tests/kconfig/external_modules/external_module_2/Makefile
View File

0
tests/kconfig/external_module_2/Makefile.include → tests/kconfig/external_modules/external_module_2/Makefile.include
View File

0
tests/kconfig/external_module_2/include/external_module_2.h → tests/kconfig/external_modules/external_module_2/include/external_module_2.h
View File

2
tests/pkg_openwsn_sock_udp/Makefile
View File

@ -38,7 +38,7 @@ USEMODULE += sock_udp
# Mock OpenWSN scheduler to handle the udp_transmit task. # Mock OpenWSN scheduler to handle the udp_transmit task.
USEMODULE += openwsn_scheduler_mock USEMODULE += openwsn_scheduler_mock
EXTERNAL_MODULE_DIRS += $(CURDIR)/scheduler EXTERNAL_MODULE_DIRS += external_modules
# Explicitly include ztimer to enable timeout # Explicitly include ztimer to enable timeout
USEMODULE += ztimer_usec USEMODULE += ztimer_usec

0
tests/pkg_utensor/models/Makefile → tests/pkg_openwsn_sock_udp/external_modules/openwsn_scheduler_mock/Makefile
View File

0
tests/pkg_openwsn_sock_udp/scheduler/Makefile.include → tests/pkg_openwsn_sock_udp/external_modules/openwsn_scheduler_mock/Makefile.include
View File

0
tests/pkg_openwsn_sock_udp/scheduler/include/scheduler_types.h → tests/pkg_openwsn_sock_udp/external_modules/openwsn_scheduler_mock/include/scheduler_types.h
View File

0
tests/pkg_openwsn_sock_udp/scheduler/scheduler.c → tests/pkg_openwsn_sock_udp/external_modules/openwsn_scheduler_mock/scheduler.c
View File

2
tests/pkg_tensorflow-lite/Makefile
View File

@ -14,7 +14,7 @@ ifeq (mnist,$(EXAMPLE))
# default for now # default for now
DISABLE_MODULE += cortexm_fpu DISABLE_MODULE += cortexm_fpu
USEMODULE += $(EXAMPLE) USEMODULE += $(EXAMPLE)
EXTERNAL_MODULE_DIRS += $(CURDIR)/$(EXAMPLE) EXTERNAL_MODULE_DIRS += external_modules
else else
# Use upstream example # Use upstream example
USEMODULE += tensorflow-lite-$(EXAMPLE) USEMODULE += tensorflow-lite-$(EXAMPLE)

0
tests/pkg_tensorflow-lite/mnist/.gitignore → tests/pkg_tensorflow-lite/external_modules/mnist/.gitignore vendored
View File

0
tests/pkg_tensorflow-lite/mnist/Makefile → tests/pkg_tensorflow-lite/external_modules/mnist/Makefile
View File

0
tests/pkg_tensorflow-lite/mnist/digit → tests/pkg_tensorflow-lite/external_modules/mnist/digit
View File

0
tests/pkg_tensorflow-lite/mnist/generate_digit.py → tests/pkg_tensorflow-lite/external_modules/mnist/generate_digit.py
View File

0
tests/pkg_tensorflow-lite/mnist/main_functions.cc → tests/pkg_tensorflow-lite/external_modules/mnist/main_functions.cc
View File

0
tests/pkg_tensorflow-lite/mnist/mnist_mlp.py → tests/pkg_tensorflow-lite/external_modules/mnist/mnist_mlp.py
View File

0
tests/pkg_tensorflow-lite/mnist/model.tflite → tests/pkg_tensorflow-lite/external_modules/mnist/model.tflite
View File

2
tests/pkg_utensor/Makefile
View File

@ -7,7 +7,7 @@ BLOBS += digit
# Include C++ model and training weights code as an external module # Include C++ model and training weights code as an external module
USEMODULE += models USEMODULE += models
EXTERNAL_MODULE_DIRS += $(CURDIR)/models EXTERNAL_MODULE_DIRS += external_modules
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/pkg_openwsn_sock_udp/scheduler/Makefile → tests/pkg_utensor/external_modules/models/Makefile
View File

@ -1,3 +1 @@
MODULE := openwsn_scheduler_mock
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

0
tests/pkg_utensor/models/Makefile.include → tests/pkg_utensor/external_modules/models/Makefile.include
View File

0
tests/pkg_utensor/models/deep_mlp.cpp → tests/pkg_utensor/external_modules/models/deep_mlp.cpp
View File

0
tests/pkg_utensor/models/deep_mlp.hpp → tests/pkg_utensor/external_modules/models/deep_mlp.hpp
View File

0
tests/pkg_utensor/models/deep_mlp_weight.hpp → tests/pkg_utensor/external_modules/models/deep_mlp_weight.hpp
View File

2
tests/pkg_utensor/main.cpp
View File

@ -23,7 +23,7 @@
#include "blob/digit.h" //contains a sample taken from the MNIST test set #include "blob/digit.h" //contains a sample taken from the MNIST test set
#include "models/deep_mlp.hpp" //generated model file #include "deep_mlp.hpp" //generated model file
#include "tensor.hpp" //useful tensor classes #include "tensor.hpp" //useful tensor classes
int main() int main()