From 2d0ea7d1e81f708aaf9066fc92784d7b44ff3e74 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 19 Jul 2023 20:14:17 +0100 Subject: Tidy up functions for running processes --- .../shedlang/compiler/testing/ProcessRunner.java | 31 -------------------- .../compiler/testing/TestProcessRunner.java | 34 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 31 deletions(-) delete mode 100644 src/test/java/org/shedlang/compiler/testing/ProcessRunner.java create mode 100644 src/test/java/org/shedlang/compiler/testing/TestProcessRunner.java (limited to 'src/test/java/org/shedlang/compiler/testing') diff --git a/src/test/java/org/shedlang/compiler/testing/ProcessRunner.java b/src/test/java/org/shedlang/compiler/testing/ProcessRunner.java deleted file mode 100644 index 8a824424..00000000 --- a/src/test/java/org/shedlang/compiler/testing/ProcessRunner.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.shedlang.compiler.testing; - -import org.shedlang.compiler.backends.llvm.ExecutionResult; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.stream.Collectors; - -public class ProcessRunner { - private ProcessRunner() { - } - - public static ExecutionResult run(List command) throws IOException, InterruptedException { - var process = new ProcessBuilder() - .command(command) - .start(); - - var exitCode = process.waitFor(); - - try ( - var stdoutReader = process.inputReader(StandardCharsets.UTF_8); - var stderrReader = process.errorReader(StandardCharsets.UTF_8) - ) { - var stdout = stdoutReader.lines().collect(Collectors.joining("\n")); - var stderr = stderrReader.lines().collect(Collectors.joining("\n")); - - return new ExecutionResult(exitCode, stdout, stderr); - } - } -} diff --git a/src/test/java/org/shedlang/compiler/testing/TestProcessRunner.java b/src/test/java/org/shedlang/compiler/testing/TestProcessRunner.java new file mode 100644 index 00000000..1c84e16f --- /dev/null +++ b/src/test/java/org/shedlang/compiler/testing/TestProcessRunner.java @@ -0,0 +1,34 @@ +package org.shedlang.compiler.testing; + +import org.shedlang.compiler.backends.llvm.ExecutionResult; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.stream.Collectors; + +public class TestProcessRunner { + private TestProcessRunner() { + } + + /** + * Run a process until it exits, capturing its stdout and stderr. + */ + public static ExecutionResult runCaptureOutput(List command) throws IOException, InterruptedException { + var process = new ProcessBuilder() + .command(command) + .start(); + + var exitCode = process.waitFor(); + + try ( + var stdoutReader = process.inputReader(StandardCharsets.UTF_8); + var stderrReader = process.errorReader(StandardCharsets.UTF_8) + ) { + var stdout = stdoutReader.lines().collect(Collectors.joining("\n")); + var stderr = stderrReader.lines().collect(Collectors.joining("\n")); + + return new ExecutionResult(exitCode, stdout, stderr); + } + } +} -- cgit v1.2.3