Merge #19551

19551: tests: move all pkg applications to their own pkgs/ folder r=aabadie a=aabadie



Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>

.murdock

@@ -130,8 +130,8 @@ tests/driver_u*
 tests/driver_v*
 tests/external_board_dirs
 tests/periph_*
-tests/pkg_elk
-tests/pkg_uzlib
+tests/pkg/elk
+tests/pkg/uzlib
 tests/prng_*
 tests/trace
 tests/xtimer_*

CODEOWNERS

@@ -146,7 +146,7 @@
 /tests/driver_dht/                          @wosym
 /tests/gnrc*                                @miri64
 /tests/lwip*                                @miri64
-/tests/pkg_libschc/                         @miri64
+/tests/pkg/libschc/                         @miri64
 /tests/slip/                                @miri64
 /tests/unittests                            @miri64
 /tests/*/tests/*.py                         @miri64

boards/esp32-heltec-lora32-v2/doc.txt

@@ -165,12 +165,12 @@ u8g2_SetI2CAddress(&u8g2, SSD1306_I2C_ADDR);
 u8g2_InitDisplay(&u8g2);
 u8g2_SetPowerSave(&u8g2, 0);
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `tests/pkg_u8g2` test application is a good example of how to use the
+The `tests/pkg/u8g2` test application is a good example of how to use the
 `pkg/u8g2` package. It can be compiled for the board with the following command:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 TEST_OUTPUT=4 TEST_I2C=0 TEST_ADDR=0x3c TEST_PIN_RESET=GPIO16 \
 TEST_DISPLAY=u8g2_Setup_ssd1306_i2c_128x64_noname_f \
-BOARD=esp32-heltec-lora32-v2 make -C tests/pkg_u8g2/ flash
+BOARD=esp32-heltec-lora32-v2 make -C tests/pkg/u8g2/ flash
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 [Back to table of contents](#esp32_heltec_lora32_v2_toc)

dist/tools/compile_test/compile_like_murdock.py

@@ -50,7 +50,7 @@ _RATIOS = [
 
 DEFAULT_APPS = [
     "examples/hello-world",
-    "tests/pkg_tinyusb_cdc_msc",
+    "tests/pkg/tinyusb_cdc_msc",
     "tests/mtd_mapper",
     "tests/shell",
     "tests/saul"

dist/tools/vera++/check.sh

@@ -13,10 +13,10 @@ CURDIR=$(cd "$(dirname "$0")" && pwd)
 
 . "$RIOTBASE"/dist/tools/ci/changed_files.sh
 . "$RIOTBASE"/dist/tools/ci/github_annotate.sh
-# tests/pkg_utensor/models/deep_mlp_weight.hpp is an auto-generated file
+# tests/pkg/utensor/models/deep_mlp_weight.hpp is an auto-generated file
 # with lots of commas so T009 takes very long. Since it is auto-generated, just
 # exclude it.
-EXCLUDE='^(.+/vendor/|dist/tools/coccinelle/include|dist/tools/fixdep/fixdep.c|dist/tools/lpc2k_pgm/src|tests/pkg_utensor/external_modules/models)'
+EXCLUDE='^(.+/vendor/|dist/tools/coccinelle/include|dist/tools/fixdep/fixdep.c|dist/tools/lpc2k_pgm/src|tests/pkg/utensor/external_modules/models)'
 FILES=$(changed_files)
 
 if [ -z "${FILES}" ]; then

examples/gcoap/README.md

@@ -88,7 +88,7 @@ implementations:
   [nanocoap library](https://github.com/kaspar030/sock/tree/master/nanocoap)
   implementation
 
-* [Microcoap](../../tests/pkg_microcoap): another lightweight CoAP server based
+* [Microcoap](../../tests/pkg/microcoap): another lightweight CoAP server based
   on the [microcoap library](https://github.com/1248/microcoap) implementation
 
 

makefiles/app_dirs.inc.mk

@@ -15,6 +15,7 @@ APPLICATION_DIRS :=                   \
     examples                          \
     tests                             \
     tests/drivers                     \
+    tests/pkg                         \
     #
 
 APPLICATION_DIRS := $(addprefix $(RIOTBASE)/,$(APPLICATION_DIRS))

pkg/libcose/doc.txt

@@ -19,7 +19,7 @@
  * The use of the library itself [is described in the libcose
  * documentation](https://bergzand.github.io/libcose/), and some example code
  * can be found in
- * [`tests/pkg_libcose/`](https://github.com/RIOT-OS/RIOT/tree/master/tests/pkg_libcose).
+ * [`tests/pkg/libcose/`](https://github.com/RIOT-OS/RIOT/tree/master/tests/pkg/libcose).
  *
  * Backends
  * --------

pkg/lvgl/doc.txt

@@ -23,7 +23,7 @@ LVGL_TASK_THREAD_PRIO cannot be configured via Kconfig.
 Example of command line for changing the max activity period to 5s:
 
 ```
-CFLAGS=-DCONFIG_LVGL_ACTIVITY_PERIOD=5000 make -C tests/pkg_lvgl
+CFLAGS=-DCONFIG_LVGL_ACTIVITY_PERIOD=5000 make -C tests/pkg/lvgl
 ```
 
 ### SDL Usage

pkg/mbedtls/doc.txt

@@ -93,7 +93,7 @@
  *
  * # Testing
  * Many Mbed TLS implementations provide self tests within the boundaries of
- * a module and the [test folder](../../tests/pkg_mbedtls) acts as a place to execute
+ * a module and the [test folder](../../tests/pkg/mbedtls) acts as a place to execute
  * these tests in RIOT context. It is noteworthy, that built-in Mbed TLS entropy source tests
  * only execute on the source that is implemented in `mbedtls_hardware_poll`.
  * The additional sources that were added using `mbedtls_entropy_add_source` are ignored in the test.

pkg/openwsn/doc.txt

@@ -322,7 +322,7 @@
  - The provided test application provides a UDP client and server. If the UDP
  server is able to receive packets, the mechanism is considered to work correctly.
  You should also be able to ping the device from your host. See
- `tests/pkg_openwsn/README.md` for more details.
+ `tests/pkg/openwsn/README.md` for more details.
 
  - To speed up synchronization and make sniffing easier you can disable channel
  hopping by setting (`CFLAGS=-DIEEE802154E_SINGLE_CHANNEL=26`).
@@ -343,7 +343,7 @@
  the IoT-LAB testbed.
 
  - To test Openserial on a given platform the target `make openv-serial` can
- be used on a BOARD flashed with `tests/pkg_openwsn` (`USEMODULE=openwsn_serial`)
+ be used on a BOARD flashed with `tests/pkg/openwsn` (`USEMODULE=openwsn_serial`)
  must be included as well. The following output should appear:
 
     ```

pkg/qcbor/doc.txt

@@ -22,7 +22,7 @@
  * For example, in the command line:
  *
  * ```
- * CFLAGS="-DQCBOR_DISABLE_INDEFINITE_LENGTH_STRINGS" BOARD=samr21-xpro make -C tests/pkg_qcbor
+ * CFLAGS="-DQCBOR_DISABLE_INDEFINITE_LENGTH_STRINGS" BOARD=samr21-xpro make -C tests/pkg/qcbor
  * ```
  *
  */

pkg/tinyusb/doc.txt

@@ -127,7 +127,7 @@
  *
  * to make the device to be a composite keyboard/mouse device.
  *
- * Please refer `$RIOTBASE/tests/pkg_tinyusb_cdc_msc` and the
+ * Please refer `$RIOTBASE/tests/pkg/tinyusb_cdc_msc` and the
  * [tinyUSB documentation](https://docs.tinyusb.org/en/latest/reference/getting_started.html)
  * for details.
  */

tests/pkg/Makefile.pkg_common

@@ -0,0 +1,2 @@
+RIOTBASE ?= $(CURDIR)/../../..
+include $(CURDIR)/../../Makefile.tests_common

tests/pkg/arduino_adafruit_sensor/Makefile

@@ -1,4 +1,6 @@
-include ../Makefile.tests_common
+BOARD ?= arduino-mega2560
+
+include ../Makefile.pkg_common
 
 USEPKG += arduino_adafruit_sensor
 

tests/pkg/arduino_sdi_12/Makefile

@@ -1,6 +1,6 @@
 BOARD ?= nucleo-f767zi
 
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEPKG += arduino_sdi_12
 

tests/pkg/arduino_sdi_12/README.md

@@ -18,7 +18,7 @@ The program will loop forever. In every loop it:
 This is an example, with the Arduino Mega2560 board and the Decagon CTD-10
 sensor:
 
-    $ BOARD=arduino-mega2560 make -C tests/pkg_arduino_sdi_12 all flash term
+    $ BOARD=arduino-mega2560 make -C tests/pkg/arduino_sdi_12 all flash term
     [...]
     2021-09-28 12:14:57,492 # main(): This is RIOT! (Version: 2021.10-devel-776-gc7af21-sdi12)
     2021-09-28 12:14:57,496 # Testing the Arduino-SDI-12 package

tests/pkg/c25519/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEMODULE += embunit
 USEMODULE += random

tests/pkg/cayenne-lpp/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEPKG += cayenne-lpp
 

tests/pkg/cifra/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEMODULE += embunit
 USEMODULE += random

tests/pkg/cmsis-dsp/Makefile

@@ -1,5 +1,5 @@
 BOARD ?= samr21-xpro
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEPKG += cmsis-dsp
 

tests/pkg/cmsis-nn/Makefile

@@ -1,5 +1,5 @@
 BOARD ?= nucleo-l476rg
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEPKG += cmsis-nn
 

tests/pkg/cn-cbor/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEPKG += cn-cbor
 USEMODULE += embunit

tests/pkg/corejson/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 # required packages
 USEPKG += corejson

tests/pkg/cryptoauthlib_compare_sha256/Makefile

@@ -1,6 +1,6 @@
 BOARD ?= nucleo-f767zi
 
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 # Test fails to build for these boards fails due to
 # redefinition of define AES_COUNT in library, which

tests/pkg/cryptoauthlib_internal-tests/Makefile

@@ -1,6 +1,6 @@
 BOARD ?= nucleo-f767zi
 
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 CFLAGS += -DTHREAD_STACKSIZE_MAIN=\(3*THREAD_STACKSIZE_DEFAULT\)
 # Test fails to build for these boards fails due to

tests/pkg/edhoc_c/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 include $(RIOTBASE)/tests/Makefile.boards.netif
 BOARD_WHITELIST += $(BOARD_PROVIDES_NETIF)

tests/pkg/edhoc_c/README.md

@@ -256,8 +256,8 @@ sudo dist/tools/tapsetup/tapsetup -c 2
 - bootstrap the `BOARD`s and specify the tap interface to use for each
 
 ```
-PORT=tap0 make -C tests/pkg_edhoc_c all term
-PORT=tap1 make -C tests/pkg_edhoc_c all term
+PORT=tap0 make -C tests/pkg/edhoc_c all term
+PORT=tap1 make -C tests/pkg/edhoc_c all term
 ```
 
 #### physical `BOARD`s
@@ -268,7 +268,7 @@ through which they will be able to communicate.
 - bootstrap the `BOARD`s
 
 ```
-make -C tests/pkg_edhoc_c flash term
+make -C tests/pkg/edhoc_c flash term
 ```
 
 ### Perform the handshake
@@ -414,5 +414,5 @@ OSCORE salt:
 As long as a BOARD with a netdev interface is used is as simple as:
 
 ```
-$ make -C tests/pkg_edhoc_c flash test-with-config
+$ make -C tests/pkg/edhoc_c flash test-with-config
 ```

tests/pkg/elk/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEPKG += elk
 

tests/pkg/emlearn/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 USEPKG += emlearn
 

tests/pkg/etl/Makefile

@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 USEPKG += etl
 
 include $(RIOTBASE)/Makefile.include