Return error as well (#98)

conbench · Jun 23, 2021 · 0bd5953 · 0bd5953
1 parent 84a1cb6
commit 0bd5953
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -695,7 +695,7 @@ class ExternalBenchmarkR(conbench.runner.Benchmark):
         )
 
     def _run_r_command(self):
-        output = self.conbench.execute_r_command(self._get_r_command())
+        output, _ = self.conbench.execute_r_command(self._get_r_command())
         result = float(output.split("\n")[-1].split("[1] ")[1])
         return result, output
 

diff --git a/conbench/runner.py b/conbench/runner.py
@@ -336,4 +336,4 @@ def execute_r_command(self, r_command, quiet=True):
         error = result.stderr.decode("utf-8").strip()
         if result.returncode != 0:
             raise Exception(error)
-        return output
+        return output, error
diff --git a/conbench/tests/benchmark/_example_benchmarks.py b/conbench/tests/benchmark/_example_benchmarks.py
@@ -101,7 +101,7 @@ def run(self, **kwargs):
         )
 
     def _run_r_command(self):
-        output = self.conbench.execute_r_command(self._get_r_command())
+        output, _ = self.conbench.execute_r_command(self._get_r_command())
         result = float(output.split("\n")[-1].split("[1] ")[1])
         return result, output