luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-08-29 09:30:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various fork in Test fixes. Closes #512 #515.

Browse Source
This commit is contained in:
Eugene Vigdorchik
2012-08-25 07:15:23 -04:00
committed by Mark Harrah
parent 089b4e284c
commit b4e64d37db
5 changed files with 57 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/agent/src/main/java/sbt/ForkMain.java
+4 -3
View File
@@ -89,6 +89,7 @@ public class ForkMain {
void write(ObjectOutputStream os, Object obj) {
try {
os.writeObject(obj);
os.flush();
} catch (IOException e) {
System.err.println("Cannot write to socket");
}
@@ -109,8 +110,10 @@ public class ForkMain {
final ForkTestDefinition[] tests = (ForkTestDefinition[]) is.readObject();
int nFrameworks = is.readInt();
for (int i = 0; i < nFrameworks; i++) {
final Framework framework;
final String implClassName = (String) is.readObject();
final String[] frameworkArgs = (String[]) is.readObject();
final Framework framework;
try {
framework = (Framework) Class.forName(implClassName).newInstance();
} catch (ClassNotFoundException e) {
@@ -118,8 +121,6 @@ public class ForkMain {
continue;
}
final String[] frameworkArgs = (String[]) is.readObject();
ArrayList<ForkTestDefinition> filteredTests = new ArrayList<ForkTestDefinition>();
for (Fingerprint testFingerprint : framework.tests()) {
for (ForkTestDefinition test : tests) {