Skip to content

Commit 565a663

Browse files
committed
Add custom overwritable build dir to pytest
1 parent 2e275da commit 565a663

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

conftest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ def pytest_generate_tests(metafunc):
1414
for marker in metafunc.definition.iter_markers():
1515
if "runner_" in marker.name:
1616
bsp_name = marker.name.removeprefix("runner_")
17+
# Some runners share a build directory thus must overwrite it
18+
build_dir = marker.kwargs.get("build_dir", f'build_{bsp_name}')
1719
bsp_param = pytest.param(
1820
f'/dev/boards/{bsp_name}',
1921
f'/dev/boards/{bsp_name}',
20-
f'build_{bsp_name}',
22+
build_dir,
2123
id=f'{bsp_name}',
2224
# Test are ran one at a time for each board
2325
marks=pytest.mark.xdist_group(name=f'{bsp_name}')

examples/display/pytest_display.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
from pytest_embedded import Dut
66

77

8-
@pytest.mark.runner_esp_box_3
8+
@pytest.mark.runner_esp_box_3(build_dir="build_esp-box-3")
99
@pytest.mark.runner_esp32_p4_function_ev_board
1010
@pytest.mark.runner_esp32_c3_lcdkit
1111
@pytest.mark.runner_esp32_s3_eye
1212
@pytest.mark.runner_esp32_s3_lcd_ev_board
13-
@pytest.mark.runner_esp32_s3_lcd_ev_board_2
13+
@pytest.mark.runner_esp32_s3_lcd_ev_board_2(build_dir="build_esp32_s3_lcd_ev_board")
1414
@pytest.mark.runner_esp32_s3_usb_otg
1515
@pytest.mark.runner_esp_wrover_kit
1616
@pytest.mark.runner_esp32_s3_korvo_2

examples/display_lvgl_benchmark/pytest_display_lvgl_benchmark.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ def get_test_diff(test1, test2, name, positive):
5454
return f"*<span style=\"color:{color}\"><sub>({sign}{diff})</sub></span>*"
5555

5656

57-
@pytest.mark.runner_esp_box_3
57+
@pytest.mark.runner_esp_box_3(build_dir="build_esp-box-3")
5858
@pytest.mark.runner_esp32_p4_function_ev_board
5959
@pytest.mark.runner_esp32_s3_eye
6060
@pytest.mark.runner_esp32_s3_lcd_ev_board
61-
@pytest.mark.runner_esp32_s3_lcd_ev_board_2
61+
@pytest.mark.runner_esp32_s3_lcd_ev_board_2(build_dir="build_esp32_s3_lcd_ev_board")
6262
@pytest.mark.runner_m5dial
6363
@pytest.mark.runner_m5stack_core_s3
6464
def test_example_lvgl_benchmark(dut: Dut, request) -> None:

examples/display_lvgl_demos/pytest_display_lvgl_demos.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from pytest_embedded import Dut
66

77

8-
@pytest.mark.runner_esp_box_3
8+
@pytest.mark.runner_esp_box_3(build_dir="build_esp-box-3")
99
@pytest.mark.runner_esp32_p4_function_ev_board
1010
@pytest.mark.runner_esp32_s3_eye
1111
@pytest.mark.runner_esp32_s3_lcd_ev_board
12-
@pytest.mark.runner_esp32_s3_lcd_ev_board_2
12+
@pytest.mark.runner_esp32_s3_lcd_ev_board_2(build_dir="build_esp32_s3_lcd_ev_board")
1313
@pytest.mark.runner_m5dial
1414
@pytest.mark.runner_m5stack_core_s3
1515
def test_example_lvgl_demos(dut: Dut) -> None:

examples/generic_button_led/pytest_generic_button_led.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from pytest_embedded import Dut
66

77

8-
@pytest.mark.runner_esp32_s3_devkitc_1_1
9-
@pytest.mark.runner_esp32_s2_devkitc_1
8+
@pytest.mark.runner_esp32_s3_devkitc_1_1(build_dir="build_esp_bsp_devkit")
9+
@pytest.mark.runner_esp32_s2_devkitc_1(build_dir="build_esp_bsp_generic")
1010
def test_example_generic_button_led(dut: Dut) -> None:
1111
dut.expect_exact('main_task: Returned from app_main()')

0 commit comments

Comments
 (0)