Add test and fix test harness

Author: JukkaL

mypyc/build.py

@@ -490,7 +490,7 @@ def mypyc_build(
     *,
     separate: bool | list[tuple[list[str], str | None]] = False,
     only_compile_paths: Iterable[str] | None = None,
-    skip_cgen_input: Any | None = None,
+    skip_cgen_input: tuple[list[list[tuple[str, str]]], list[str]] | None = None,
     always_use_shared_lib: bool = False,
 ) -> tuple[emitmodule.Groups, list[tuple[list[str], list[str]]], list[SourceDep]]:
     """Do the front and middle end of mypyc building, producing and writing out C source."""
@@ -523,7 +523,8 @@ def mypyc_build(
         # TODO: unique names?
         write_file(os.path.join(compiler_options.target_dir, "ops.txt"), ops_text)
     else:
-        group_cfiles = skip_cgen_input
+        group_cfiles = skip_cgen_input[0]
+        source_deps = [SourceDep(d) for d in skip_cgen_input[1]]
 
     # Write out the generated C and collect the files for each group
     # Should this be here??
@@ -553,7 +554,7 @@ def mypycify(
     strip_asserts: bool = False,
     multi_file: bool = False,
     separate: bool | list[tuple[list[str], str | None]] = False,
-    skip_cgen_input: Any | None = None,
+    skip_cgen_input: tuple[list[list[tuple[str, str]]], list[str]] | None = None,
     target_dir: str | None = None,
     include_runtime_files: bool | None = None,
     strict_dunder_typing: bool = False,

mypyc/test-data/run-multimodule.test

@@ -950,3 +950,15 @@ import native
 15
 NT(x=4)
 {'x': 5}
+
+[case testExtraLibRtSourceFileDep]
+table_list = list(range(256))
+table_list[ord('A')] = ord('B')
+table = bytes(table_list)
+
+def translate(b: bytes) -> bytes:
+    # The primimitive for bytes.translate requires an optional C file from lib-rt
+    return b.translate(table)
+[file driver.py]
+import native
+assert native.translate(b'ABCD') == b'BBCD'

mypyc/test/test_run.py

@@ -22,6 +22,7 @@
 from mypy.test.helpers import assert_module_equivalence, perform_file_operations
 from mypyc.build import construct_groups
 from mypyc.codegen import emitmodule
+from mypyc.codegen.emitmodule import collect_source_dependencies
 from mypyc.errors import Errors
 from mypyc.options import CompilerOptions
 from mypyc.test.config import test_data_prefix
@@ -266,6 +267,7 @@ def run_case_step(self, testcase: DataDrivenTestCase, incremental_step: int) ->
             ir, cfiles, _ = emitmodule.compile_modules_to_c(
                 result, compiler_options=compiler_options, errors=errors, groups=groups
             )
+            deps = sorted(dep.path for dep in collect_source_dependencies(ir))
             if errors.num_errors:
                 errors.flush_errors()
                 assert False, "Compile error"
@@ -288,7 +290,7 @@ def run_case_step(self, testcase: DataDrivenTestCase, incremental_step: int) ->
                 setup_format.format(
                     module_paths,
                     separate,
-                    cfiles,
+                    (cfiles, deps),
                     self.multi_file,
                     opt_level,
                     librt,