unix: create a new API for retrieving output files

This is all we used run_output() for.

Author: indygreg

cpython-unix/build.py

@@ -323,16 +323,8 @@ def python_build_info(
     core_objs = set()
     modules_objs = set()
 
-    res = build_env.run_capture(
-        ["/usr/bin/find", "/build/out/python/build", "-name", "*.o"], user="build"
-    )
-
-    for line in res[1].splitlines():
-        if not line.strip():
-            continue
-
-        p = pathlib.Path(os.fsdecode(line))
-        rel_path = p.relative_to("/build/out/python")
+    for f in build_env.find_output_files("python/build", "*.o"):
+        rel_path = pathlib.Path(f)
 
         if rel_path.parts[1] in ("Objects", "Parser", "Python"):
             core_objs.add(rel_path)
@@ -346,14 +338,8 @@ def python_build_info(
 
     libraries = set()
 
-    for line in build_env.run_capture(
-        ["/usr/bin/find", "/build/out/python/build/lib", "-name", "*.a"], user="build"
-    )[1].splitlines():
-
-        if not line.strip():
-            continue
-
-        f = line[len("/build/out/python/build/lib/") :].decode("ascii")
+    for f in build_env.find_output_files("python/build/lib", "*.a"):
+        f = f[len("python/build/lib/") :]
 
         # Strip "lib" prefix and ".a" suffix.
         libname = f[3:-2]

pythonbuild/buildenv.py

@@ -3,7 +3,9 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 import contextlib
+import fnmatch
 import io
+import os
 import pathlib
 import shutil
 import tarfile
@@ -61,9 +63,6 @@ def run(self, program, user="build", environment=None):
 
         container_exec(self.container, program, user=user, environment=environment)
 
-    def run_capture(self, command, user=None):
-        return self.container.exec_run(command, user=user)
-
     def get_tools_archive(self, dest, name):
         log("copying container files to %s" % dest)
         data = container_get_archive(self.container, "/build/out/tools/%s" % name)
@@ -80,6 +79,15 @@ def get_archive(self, path, as_tar=False):
         else:
             return data.getvalue()
 
+    def find_output_files(self, base_path, pattern):
+        command = ["/usr/bin/find", "/build/out/%s" % base_path, "-name", pattern]
+
+        for line in self.container.exec_run(command, user="build")[1].splitlines():
+            if not line.strip():
+                continue
+
+            yield line[len("/build/out/%s/" % base_path) :].decode("ascii")
+
 
 class TempdirContext(object):
     def __init__(self, td):
@@ -143,6 +151,17 @@ def get_tools_archive(self, dest, name):
         with dest.open("wb") as fh:
             create_tar_from_directory(fh, self.td / "out" / "tools")
 
+    def find_output_files(self, base_path, pattern):
+        base = str(self.td / "out" / base_path)
+
+        for root, dirs, files in os.walk(base):
+            dirs.sort()
+
+            for f in sorted(files):
+                if fnmatch.fnmatch(f, pattern):
+                    full = os.path.join(root, f)
+                    yield full[len(base) + 1 :]
+
 
 @contextlib.contextmanager
 def build_environment(client, image):