M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-09-25 01:42:30 +03:00
parent 679e46499e
commit 45fcf9b585
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml generated
View File

@@ -8,17 +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/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.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" />

1
src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
View File

@@ -13,4 +13,5 @@ public class DVMPackage_json implements Serializable {
public int getMaxTaskId() { public int getMaxTaskId() {
return max_task_id++; return max_task_id++;
} }
} }

9
src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

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