From 45fcf9b5850cc741cc0037739dc44f4e4e98d88e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 25 Sep 2024 01:42:30 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                   | 11 +----------
 src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java |  1 +
 src/TestingSystem/DVM/RemoteDVMTestingPlanner.java    |  9 +++++++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 60724f84..93675277 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,17 +8,8 @@
   <component name="ChangeListManager">
     <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$/src/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.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/DVMPackage/DVMPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.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>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java b/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
index 7b1bd455..bb43f562 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
@@ -13,4 +13,5 @@ public class DVMPackage_json implements Serializable {
     public int getMaxTaskId() {
         return max_task_id++;
     }
+
 }
diff --git a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 545c25f7..1d5da392 100644
--- a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -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 {