[microTVM] Replace static fixtures with parameterization

python/tvm/micro/testing/pytest_plugin.py

@@ -26,14 +26,18 @@
 
 from tvm.contrib.utils import tempdir
 
-from .utils import get_supported_boards
+from .utils import get_supported_platforms, get_supported_boards
 
 
 def pytest_addoption(parser):
     """Adds more pytest arguments"""
+    parser.addoption(
+        "--platform",
+        choices=get_supported_platforms(),
+        help=("microTVM platform for tests."),
+    )
     parser.addoption(
         "--board",
-        required=True,
         choices=list(get_supported_boards("zephyr").keys())
         + list(get_supported_boards("arduino").keys()),
         help=(
@@ -58,9 +62,25 @@ def pytest_addoption(parser):
     )
 
 
-@pytest.fixture(scope="session")
-def board(request):
-    return request.config.getoption("--board")
+def pytest_generate_tests(metafunc):
+    """Hooks into pytest to add platform and board fixtures to tests that
+    require them. To make sure that "platform" and "board" are treated as
+    parameters for the appropriate tests (and included in the test names),
+    we add them as function level parametrizations. This prevents data
+    from being overwritten in Junit XML files if multiple platforms
+    or boards are tested."""
+
+    for argument in ["platform", "board"]:
+        if argument in metafunc.fixturenames:
+            value = metafunc.config.getoption(f"--{argument}", default=None)
+
+            if not value:
+                raise ValueError(
+                    f"Test {metafunc.function.__name__} in module {metafunc.module.__name__} "
+                    f"requires a --{argument} argument, but none was given."
+                )
+
+            metafunc.parametrize(argument, [metafunc.config.getoption(f"--{argument}")])
 
 
 @pytest.fixture(scope="session")

python/tvm/micro/testing/utils.py

@@ -33,6 +33,11 @@
 TIMEOUT_SEC = 10
 
 
+@lru_cache(maxsize=None)
+def get_supported_platforms():
+    return ["arduino", "zephyr"]
+
+
 @lru_cache(maxsize=None)
 def get_supported_boards(platform: str):
     template = Path(tvm.micro.get_microtvm_template_projects(platform))

tests/micro/arduino/test_arduino_workflow.py

@@ -37,9 +37,12 @@
 """
 
 # Since these tests are sequential, we'll use the same project/workspace
-# directory for all tests in this file
+# directory for all tests in this file. Note that --board can't be loaded
+# from the fixture, since the fixture is function scoped (it has to be
+# for the tests to be named correctly via parameterization).
 @pytest.fixture(scope="module")
-def workflow_workspace_dir(request, board):
+def workflow_workspace_dir(request):
+    board = request.config.getoption("--board")
     return test_utils.make_workspace_dir("arduino_workflow", board)
 
 
@@ -48,9 +51,11 @@ def project_dir(workflow_workspace_dir):
     return workflow_workspace_dir / "project"
 
 
-# We MUST pass workspace_dir, not project_dir, or the workspace will be dereferenced too soon
+# We MUST pass workspace_dir, not project_dir, or the workspace will be dereferenced
+# too soon. We can't use the board fixture either for the reason mentioned above.
 @pytest.fixture(scope="module")
-def project(board, arduino_cli_cmd, microtvm_debug, workflow_workspace_dir):
+def project(request, arduino_cli_cmd, microtvm_debug, workflow_workspace_dir):
+    board = request.config.getoption("--board")
     return test_utils.make_kws_project(
         board, arduino_cli_cmd, microtvm_debug, workflow_workspace_dir
     )

tests/micro/common/conftest.py

@@ -17,19 +17,3 @@
 pytest_plugins = [
     "tvm.micro.testing.pytest_plugin",
 ]
-
-import pytest
-
-
-def pytest_addoption(parser):
-    parser.addoption(
-        "--platform",
-        required=True,
-        choices=["arduino", "zephyr"],
-        help="Platform to run tests with",
-    )
-
-
-@pytest.fixture
-def platform(request):
-    return request.config.getoption("--platform")