no message
This commit is contained in:
@@ -13,4 +13,5 @@ public class DVMPackage_json implements Serializable {
|
||||
public int getMaxTaskId() {
|
||||
return max_task_id++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
LinkedHashMap<Integer, File> tests = getTestsFromJson();
|
||||
//синхронизировать их.
|
||||
for (int test_id : tests.keySet()) {
|
||||
System.out.println("test="+test_id);
|
||||
System.out.println("test=" + test_id);
|
||||
File test = tests.get(test_id);
|
||||
RemoteFile test_dst = new RemoteFile(testingPackage.user_workspace + "/projects/" + test_id, true);
|
||||
user.connection.MKDIR(test_dst);
|
||||
@@ -92,6 +92,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
}
|
||||
@Override
|
||||
protected void AnalyseResults() throws Exception {
|
||||
boolean hasErrors = false;
|
||||
testingPackage.readJson();
|
||||
Print("analysing results");
|
||||
Vector<DVMRunTask> runTasks = new Vector<>();
|
||||
@@ -106,6 +107,8 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
//--
|
||||
for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
|
||||
compilationTask.dvm_package_id = testingPackage.id;
|
||||
if (!compilationTask.state.equals(TaskState.Done))
|
||||
hasErrors = true;
|
||||
ct_count++;
|
||||
File ct_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(compilationTask.id)).toFile();
|
||||
if (ct_workspace.exists()) {
|
||||
@@ -149,13 +152,15 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!runTask.state.equals(TaskState.Done))
|
||||
hasErrors = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
testingPackage.progress = 100;
|
||||
testingPackage.saveJson(); //запись обновленных результатов пакета в json!
|
||||
Print("analysis done, ct_count=" + ct_count + " rt count=" + rt_count);
|
||||
UpdatePackageState(TasksPackageState.Done);
|
||||
UpdatePackageState(hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done);
|
||||
}
|
||||
@Override
|
||||
protected void PackageStart() throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user