no message
This commit is contained in:
5
.idea/workspace.xml
generated
5
.idea/workspace.xml
generated
@@ -8,9 +8,8 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareSapforPackages.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -22,11 +22,11 @@
|
|||||||
"Kernels": 8,
|
"Kernels": 8,
|
||||||
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
||||||
"CheckTestingIntervalSeconds": 10,
|
"CheckTestingIntervalSeconds": 10,
|
||||||
"AutoCheckTesting": false,
|
"AutoCheckTesting": true,
|
||||||
"EmailOnTestingProgress": true,
|
"EmailOnTestingProgress": true,
|
||||||
"lastMachineId": 13,
|
"lastMachineId": 11,
|
||||||
"lastUserId": 34,
|
"lastUserId": 23,
|
||||||
"lastCompilerId": 52,
|
"lastCompilerId": 40,
|
||||||
"RegisterOn": false,
|
"RegisterOn": false,
|
||||||
"SpacesOn": false,
|
"SpacesOn": false,
|
||||||
"EmptyLinesOn": false,
|
"EmptyLinesOn": false,
|
||||||
|
|||||||
@@ -117,7 +117,8 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
|||||||
runTask.state = TaskState.Canceled;
|
runTask.state = TaskState.Canceled;
|
||||||
} else {
|
} else {
|
||||||
File rt_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(runTask.id)).toFile();
|
File rt_workspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), "results", String.valueOf(runTask.id)).toFile();
|
||||||
if (rt_workspace.exists() && runTask.state.equals(TaskState.Finished)) {
|
if (rt_workspace.exists() && runTask.state.equals(TaskState.Finished)
|
||||||
|
) {
|
||||||
//анализ задачи на запуск.
|
//анализ задачи на запуск.
|
||||||
File outFile = new File(rt_workspace, Constants.out_file);
|
File outFile = new File(rt_workspace, Constants.out_file);
|
||||||
File errFile = new File(rt_workspace.getAbsolutePath(), Constants.err_file);
|
File errFile = new File(rt_workspace.getAbsolutePath(), Constants.err_file);
|
||||||
|
|||||||
@@ -559,9 +559,10 @@ public class Utils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
TaskState state = TaskState.Finished;
|
TaskState state = TaskState.Finished;
|
||||||
if (starts != ends) {
|
if (starts == 0 || ends == 0) {
|
||||||
state = TaskState.WrongTestFormat;
|
state = TaskState.WrongTestFormat;
|
||||||
} else if (errors > 0) {
|
} else
|
||||||
|
if (errors > 0) {
|
||||||
state = TaskState.DoneWithErrors;
|
state = TaskState.DoneWithErrors;
|
||||||
} else {
|
} else {
|
||||||
state = TaskState.Done;
|
state = TaskState.Done;
|
||||||
|
|||||||
Reference in New Issue
Block a user