luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add library-friendly entrypoint for sbt.ForkMain 

Previously, it was not possible to use `sbt.ForkMain` as a library since
* it called `System.exit`, shutting down the library client JVM process.
* it assumed that it was always running in the same classloader as where
  the test suites it was running causing "class not found: my.test.Suite"
  if the `ForkMain` class lives in a classloader above the test suite
  classes.
This commit adds a new `main(Array[String],ClassLoader])` entrypoint
that allows clients to call `ForkMain` as a library.
This commit is contained in:
Olafur Pall Geirsson 2019-12-17 10:47:12 +00:00
parent cba7442618
commit fd658f38d3
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
testing/agent/src/main/java/sbt/ForkMain.java
View File

@ -117,20 +117,25 @@ final public class ForkMain {
// ----------------------------------------------------------------------------------------------------------------
public static void main(final String[] args) throws Exception {
ClassLoader classLoader = new Run().getClass().getClassLoader();
try {
main(args, classLoader);
} finally {
System.exit(0);
}
}
public static void main(final String[] args, ClassLoader classLoader) throws Exception {
final Socket socket = new Socket(InetAddress.getByName(null), Integer.valueOf(args[0]));
final ObjectInputStream is = new ObjectInputStream(socket.getInputStream());
final ObjectOutputStream os = new ObjectOutputStream(socket.getOutputStream());
// Must flush the header that the constructor writes, otherwise the ObjectInputStream on the other end may block indefinitely
os.flush();
try {
new Run().run(is, os);
new Run().run(is, os, classLoader);
} finally {
try {
is.close();
os.close();
} finally {
System.exit(0);
}
is.close();
os.close();
}
}
@ -139,9 +144,9 @@ final public class ForkMain {
final private static class Run {
private void run(final ObjectInputStream is, final ObjectOutputStream os) {
private void run(final ObjectInputStream is, final ObjectOutputStream os, ClassLoader classLoader) {
try {
runTests(is, os);
runTests(is, os, classLoader);
} catch (final RunAborted e) {
internalError(e);
} catch (final Throwable t) {
@ -217,7 +222,7 @@ final public class ForkMain {
}
}
private void runTests(final ObjectInputStream is, final ObjectOutputStream os) throws Exception {
private void runTests(final ObjectInputStream is, final ObjectOutputStream os, ClassLoader classLoader) throws Exception {
final ForkConfiguration config = (ForkConfiguration) is.readObject();
final ExecutorService executor = executorService(config, os);
final TaskDef[] tests = (TaskDef[]) is.readObject();
@ -254,7 +259,7 @@ final public class ForkMain {
filteredTests.add(new TaskDef(test.fullyQualifiedName(), test.fingerprint(), test.explicitlySpecified(), test.selectors()));
}
}
final Runner runner = framework.runner(frameworkArgs, remoteFrameworkArgs, getClass().getClassLoader());
final Runner runner = framework.runner(frameworkArgs, remoteFrameworkArgs, classLoader);
final Task[] tasks = runner.tasks(filteredTests.toArray(new TaskDef[filteredTests.size()]));
logDebug(os, "Runner for " + framework.getClass().getName() + " produced " + tasks.length + " initial tasks for " + filteredTests.size() + " tests.");