diff --git a/apps/microtvm/zephyr/aot_demo/src/zephyr_uart.c b/apps/microtvm/zephyr/aot_demo/src/zephyr_uart.c index 4879f7565551..02401584f652 100644 --- a/apps/microtvm/zephyr/aot_demo/src/zephyr_uart.c +++ b/apps/microtvm/zephyr/aot_demo/src/zephyr_uart.c @@ -77,13 +77,11 @@ uint32_t TVMPlatformWriteSerial(const char* data, uint32_t size) { void TVMPlatformUARTInit() { // Claim console device. g_microtvm_uart = device_get_binding(DT_LABEL(DT_CHOSEN(zephyr_console))); - const struct uart_config config = { - .baudrate = 115200, - .parity = UART_CFG_PARITY_NONE, - .stop_bits = UART_CFG_STOP_BITS_1, - .data_bits = UART_CFG_DATA_BITS_8, - .flow_ctrl = UART_CFG_FLOW_CTRL_NONE - }; + const struct uart_config config = {.baudrate = 115200, + .parity = UART_CFG_PARITY_NONE, + .stop_bits = UART_CFG_STOP_BITS_1, + .data_bits = UART_CFG_DATA_BITS_8, + .flow_ctrl = UART_CFG_FLOW_CTRL_NONE}; uart_configure(g_microtvm_uart, &config); uart_rx_init(&uart_rx_rbuf, g_microtvm_uart); } diff --git a/tests/micro/zephyr/conftest.py b/tests/micro/zephyr/conftest.py index 285a4b0b867f..fc68d6715e13 100644 --- a/tests/micro/zephyr/conftest.py +++ b/tests/micro/zephyr/conftest.py @@ -59,7 +59,12 @@ def pytest_addoption(parser): def pytest_generate_tests(metafunc): - if "platform" in metafunc.fixturenames: + parametrized_args = [ + arg.strip() + for mark in metafunc.definition.iter_markers("parametrize") + for arg in mark.args[0].split(",") + ] + if "platform" not in parametrized_args: metafunc.parametrize("platform", metafunc.config.getoption("microtvm_platforms").split(",")) diff --git a/tests/micro/zephyr/test_zephyr_aot.py b/tests/micro/zephyr/test_zephyr_aot.py index afdbdc590de0..e1869227c789 100644 --- a/tests/micro/zephyr/test_zephyr_aot.py +++ b/tests/micro/zephyr/test_zephyr_aot.py @@ -213,6 +213,7 @@ def test_tflite(platform, west_cmd, skip_build, tvm_debug): assert result == 8 +@pytest.mark.parametrize("platform", ["host", "mps2_an521"]) def test_qemu_make_fail(platform, west_cmd, skip_build, tvm_debug): """Testing QEMU make fail.""" model, zephyr_board = PLATFORMS[platform]