From bd74d4684f0c66d3e40a1a0ed082f0fc221f9b0f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 2 Dec 2023 17:52:12 +0300
Subject: [PATCH] v++

---
 .idea/workspace.xml                           |  8 +++----
 src/Repository/Component/Visualiser.java      |  2 +-
 .../DVM/TestsSupervisor_2022.java             | 22 +++++++++----------
 .../Passes/All/StartTests.java                | 17 ++++++++++----
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e3b944ea..cb2241c9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,11 +8,9 @@
   <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/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 2478d0e6..d41bc5d7 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1041;
+        version = 1042;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/TestingSystem/DVM/TestsSupervisor_2022.java b/src/TestingSystem/DVM/TestsSupervisor_2022.java
index 49931deb..e8cf5776 100644
--- a/src/TestingSystem/DVM/TestsSupervisor_2022.java
+++ b/src/TestingSystem/DVM/TestsSupervisor_2022.java
@@ -5,13 +5,13 @@ import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.TaskState;
 import Repository.Server.ServerCode;
+import TestingSystem.Common.Test.TestType;
+import TestingSystem.Common.TestingPlanner;
 import TestingSystem.DVM.Tasks.TestCompilationTask;
 import TestingSystem.DVM.Tasks.TestRunTask;
 import TestingSystem.DVM.Tasks.TestTask;
 import TestingSystem.DVM.TasksPackage.TasksPackage;
 import TestingSystem.DVM.TasksPackage.TasksPackageState;
-import TestingSystem.Common.Test.TestType;
-import TestingSystem.Common.TestingPlanner;
 import com.jcraft.jsch.ChannelSftp;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
@@ -41,18 +41,18 @@ public class TestsSupervisor_2022 {
         packageRemoteWorkspace = new RemoteFile(tasksPackage.user_workspace + "/tests", String.valueOf(tasksPackage.id), true);
         packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(tasksPackage.id));
     }
-    public boolean packageNeedsKill() throws Exception{
-        return (boolean) planner.ServerCommand(ServerCode.CheckPackageToKill,tasksPackage.id);
+    public boolean packageNeedsKill() throws Exception {
+        return (boolean) planner.ServerCommand(ServerCode.CheckPackageToKill, tasksPackage.id);
     }
     public void Perform() throws Exception {
-        if (packageNeedsKill()){
-            System.out.println("PACKAGE "+tasksPackage.id+" NEEDS TO KILL");
+        if (packageNeedsKill()) {
+            System.out.println("PACKAGE " + tasksPackage.id + " NEEDS TO KILL");
             if (!tasksPackage.pid.isEmpty()) {
                 connection.ShellCommand("kill -9 " + tasksPackage.pid);
             }
             tasksPackage.state = TasksPackageState.Aborted;
             planner.UpdatePackage();
-        }else {
+        } else {
             switch (tasksPackage.state) {
                 case TestsSynchronize:
                     TestsSynchronize();
@@ -140,11 +140,11 @@ public class TestsSupervisor_2022 {
                 );
         connection.ShellCommand(plannerStartCommand);
         RemoteFile PID = new RemoteFile(packageRemoteWorkspace, "PID");
-        while (!connection.Exists(packageRemoteWorkspace.full_name, "STARTED")){
+        while (!connection.Exists(packageRemoteWorkspace.full_name, "STARTED")) {
             System.out.println("waiting for package start...");
             Utils.sleep(1000);
         }
-        if (connection.Exists(packageRemoteWorkspace.full_name, "PID")){
+        if (connection.Exists(packageRemoteWorkspace.full_name, "PID")) {
             tasksPackage.pid = connection.readFromFile(PID);
         }
     }
@@ -176,7 +176,7 @@ public class TestsSupervisor_2022 {
                 for (TestRunTask testRunTask : testCompilationTask.runTasks) {
                     TryDownloadTask(testRunTask);
                 }
-            }else {
+            } else {
                 //задача на компиляцию не состоялась. значит и все ее задачи на запуск тоже.
                 for (TestRunTask testRunTask : testCompilationTask.runTasks) {
                     testRunTask.state = TaskState.Canceled;
@@ -190,7 +190,6 @@ public class TestsSupervisor_2022 {
         if (
                 !testTask.state.equals(TaskState.ResultsDownloaded) &&
                         !testTask.state.equals(TaskState.Canceled)
-
         ) {
             File taskLocalWorkspace = Paths.get(packageLocalWorkspace.getAbsolutePath(), String.valueOf(testTask.id)).toFile();
             RemoteFile taskRemoteWorkspace = new RemoteFile(packageRemoteWorkspace.full_name, String.valueOf(testTask.id));
@@ -266,7 +265,6 @@ public class TestsSupervisor_2022 {
                         Vector<ChannelSftp.LsEntry> files = connection.sftpChannel.ls(testRunTask.remote_workspace);
                         for (ChannelSftp.LsEntry file : files) {
                             if (file.getFilename().equals("sts.gz+")) {
-
                                 RemoteFile remote_sts = new RemoteFile(
                                         testRunTask.remote_workspace, file.getFilename(), false);
                                 RemoteFile remote_sts_text = new RemoteFile(
diff --git a/src/Visual_DVM_2021/Passes/All/StartTests.java b/src/Visual_DVM_2021/Passes/All/StartTests.java
index e5a62d3c..2e323959 100644
--- a/src/Visual_DVM_2021/Passes/All/StartTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartTests.java
@@ -69,6 +69,14 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
         }
         return false;
     }
+    public static String checkFlags(String flags_in) {
+        if (!flags_in.contains("-shared-dvm")) {
+            if (flags_in.isEmpty())
+                return "-shared-dvm";
+            else return flags_in + " -shared-dvm";
+        } else
+            return flags_in;
+    }
     public static Vector<TestCompilationTask> createTasksCGT(
             TestingSystem.DVM.Configuration.Configuration configuration,
             Group group,
@@ -76,11 +84,12 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
     ) {
         Vector<TestCompilationTask> compilationTasks = new Vector<>();
         for (String flags : configuration.getFlags()) {
+            String checked_flags = checkFlags(flags);
             TestCompilationTask testCompilationTask = new TestCompilationTask(
                     configuration,
                     group,
                     test,
-                    flags
+                    checked_flags
             );
             testCompilationTask.runTasks = new Vector<>();
             Vector<String> matrixes = configuration.getMatrixes(test.max_dim);
@@ -92,7 +101,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
                             group,
                             test,
                             "",
-                            flags,
+                            checked_flags,
                             environmentSet,
                             configuration.getParamsText()
                     ));
@@ -103,7 +112,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
                                 group,
                                 test,
                                 matrix,
-                                flags,
+                                checked_flags,
                                 environmentSet,
                                 configuration.getParamsText()));
                     }
@@ -148,7 +157,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
                     Vector<Test> groupTests = new Vector<>();
                     Vector<Test> checkedGroupTests = new Vector<>();
                     for (Test test : server.db.tests.Data.values()) {
-                        if (test.group_id==group.id) {
+                        if (test.group_id == group.id) {
                             groupTests.add(test);
                             if (test.isSelected())
                                 checkedGroupTests.add(test);