fuzz: Output error log even when subprocess returns non-0 exit code

hodlinator · hodlinator · commit 3dd6ef5c174c · 2024-12-20T11:25:07.000+01:00
Before, subprocess.run() would throw CalledProcessError from inside the logging.debug() call, preventing the latter from completing.
diff --git a/test/fuzz/test_runner.py b/test/fuzz/test_runner.py
@@ -257,9 +257,8 @@ def generate_corpus(*, fuzz_pool, src_dir, fuzz_bin, corpus_dir, targets):
 
     def job(command, t, t_env):
         logging.debug(f"Running '{command}'")
-        logging.debug("Command '{}' output:\n'{}'\n".format(
-            command,
-            subprocess.run(
+        try:
+            process = subprocess.run(
                 command,
                 env={
                     **t_env,
@@ -268,8 +267,13 @@ def job(command, t, t_env):
                 check=True,
                 stderr=subprocess.PIPE,
                 text=True,
-            ).stderr,
-        ))
+            )
+            output = process.stderr
+        except subprocess.CalledProcessError as e:
+            output = e.stderr
+        else:
+            raise
+        logging.debug(f"Command '{command}' output:\n'{output}'\n")
 
     futures = []
     for target, t_env in targets:
