tools/tinytest-codegen, qemu-arm: Generate port-specific tests.

agatti · agatti · commit 7ec2899fdaac · 2023-11-02T13:37:13.000+01:00
Tinytest code generation for bare-metal targets now allows to choose
which port to generate tests for.  Tinytest generation is not hardcoded
to `qemu-arm` anymore, allowing more bare-metal targets to have their
own tests.

The `qemu-arm` port was modified to work with the generator changes.

Signed-off-by: Alessandro Gatti &lt;a.gatti@frob.it&gt;
diff --git a/ports/qemu-arm/Makefile.test b/ports/qemu-arm/Makefile.test
@@ -16,7 +16,7 @@ CFLAGS += -DTEST
 $(BUILD)/test_main.o: $(BUILD)/genhdr/tests.h
 $(BUILD)/genhdr/tests.h:
 	(cd $(TOP)/tests; ./run-tests.py --target=qemu-arm --write-exp)
-	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
+	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py --port qemu-arm $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
 
 $(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
 
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
@@ -50,17 +50,17 @@ def script_to_map(test_file):
 testgroup_member = '  {{ "{name}", {name}_tests }},'
 
 ## XXX: may be we could have `--without <groups>` argument...
-# currently these tests are selected because they pass on qemu-arm
-test_dirs = (
+
+# Common test directories and tests exclusion list
+
+common_test_directories = (
     "basics",
-    "micropython",
-    "misc",
     "extmod",
     "float",
-    "inlineasm",
-    "qemu-arm",
-)  # 'import', 'io',)
-exclude_tests = (
+    "misc",
+)
+
+common_excluded_tests = (
     # pattern matching in .exp
     "basics/bytes_compare3.py",
     "extmod/ticks_diff.py",
@@ -80,19 +80,6 @@ def script_to_map(test_file):
     "float/float2int_doubleprec_intbig.py",
     "float/float_format_ints_doubleprec.py",
     "float/float_parse_doubleprec.py",
-    # inline asm FP tests (require Cortex-M4)
-    "inlineasm/asmfpaddsub.py",
-    "inlineasm/asmfpcmp.py",
-    "inlineasm/asmfpldrstr.py",
-    "inlineasm/asmfpmuldiv.py",
-    "inlineasm/asmfpsqrt.py",
-    # different filename in output
-    "micropython/emg_exc.py",
-    "micropython/heapalloc_traceback.py",
-    # don't have emergency exception buffer
-    "micropython/heapalloc_exc_compressed_emg_exc.py",
-    # pattern matching in .exp
-    "micropython/meminfo.py",
     # needs sys stdfiles
     "misc/print_exception.py",
     # settrace .exp files are too large
@@ -104,6 +91,30 @@ def script_to_map(test_file):
     "basics/string_fstring_debug.py",
 )
 
+# Port-specific test directories and tests exclusion list
+
+port_test_directories = {
+    "qemu-arm": ("inlineasm", "micropython", "qemu-arm"),
+}
+
+port_tests_exclusion_lists = {
+    "qemu-arm": (
+        # inline asm FP tests (require Cortex-M4)
+        "inlineasm/asmfpaddsub.py",
+        "inlineasm/asmfpcmp.py",
+        "inlineasm/asmfpldrstr.py",
+        "inlineasm/asmfpmuldiv.py",
+        "inlineasm/asmfpsqrt.py",
+        # different filename in output
+        "micropython/emg_exc.py",
+        "micropython/heapalloc_traceback.py",
+        # don't have emergency exception buffer
+        "micropython/heapalloc_exc_compressed_emg_exc.py",
+        # pattern matching in .exp
+        "micropython/meminfo.py",
+    )
+}
+
 output = []
 tests = []
 
@@ -112,8 +123,13 @@ def script_to_map(test_file):
 )
 argparser.add_argument("--stdin", action="store_true", help="read list of tests from stdin")
 argparser.add_argument("--exclude", action="append", help="exclude test by name")
+argparser.add_argument("--port", help="optional MicroPython port name to generate tests for")
 args = argparser.parse_args()
 
+port_name = args.port.lower() if args.port else None
+test_dirs = common_test_directories + port_test_directories.get(port_name, ())
+exclude_tests = common_excluded_tests + port_tests_exclusion_lists.get(port_name, ())
+
 if not args.stdin:
     if args.exclude:
         exclude_tests += tuple(args.exclude)
