Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CTRL-C exception #4226

Merged
merged 1 commit into from
Jun 26, 2018
Merged

Fix CTRL-C exception #4226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions testing/agent/src/main/java/sbt/ForkMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,19 @@ private void runTests(final ObjectInputStream is, final ObjectOutputStream os) t
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.");

Thread callDoneOnShutdown = new Thread() {
@Override
public void run() {
runner.done();
}
};
Runtime.getRuntime().addShutdownHook(callDoneOnShutdown);

runTestTasks(executor, tasks, loggers, os);

runner.done();

Runtime.getRuntime().removeShutdownHook(callDoneOnShutdown);
}
write(os, ForkTags.Done);
is.readObject();
Expand Down