From ccedf382293ff7d052f4a1ba91accf0b72c40500 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 30 Sep 2023 18:22:14 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                  | 8 +-------
 src/SapforTestingSystem/SapforTest/SapforTest.java   | 5 +++--
 src/Visual_DVM_2021/Passes/All/StartSapforTests.java | 3 +++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 307af69f..7cb2f7a1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,7 @@
   </component>
   <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/Constants/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenario_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforScenario_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTest/SapforTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTest/SapforTest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/SapforTestingSystem/SapforTest/SapforTest.java b/src/SapforTestingSystem/SapforTest/SapforTest.java
index fa7c46ba..79c2d8f0 100644
--- a/src/SapforTestingSystem/SapforTest/SapforTest.java
+++ b/src/SapforTestingSystem/SapforTest/SapforTest.java
@@ -1,5 +1,6 @@
 package SapforTestingSystem.SapforTest;
 import Common.Constants.Constants;
+import Common.Global;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
@@ -62,7 +63,7 @@ public class SapforTest {
         Utils.delete_with_check(outputFile);
         Utils.delete_with_check(errorsFile);
         //---
-        File file = new File(data_workspace, name + ".bat");
+        File file = new File(data_workspace, name + (Global.isWindows?".bat":".sh"));
         FileUtils.write(file,
                 Utils.DQuotes(sapfor_drv.getAbsolutePath())
                         + (flags.isEmpty() ? "" : (" " + flags))
@@ -74,7 +75,7 @@ public class SapforTest {
                         Utils.DQuotes(errorsFile.getAbsolutePath()),
                 Charset.defaultCharset());
         if (!file.setExecutable(true))
-            throw new PassException("Не удалось сделать файл скрипта " + name + " исполняемым!");
+            throw new Exception("Не удалось сделать файл скрипта " + name + " исполняемым!");
         //--
         ProcessBuilder procBuilder = new ProcessBuilder(file.getAbsolutePath());
         procBuilder.directory(workspace);
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index 801fd5ad..c74a8342 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -19,6 +19,7 @@ import TestingSystem.Group.Group;
 import TestingSystem.Test.Test;
 import TestingSystem.Test.TestInterface;
 import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
 import org.apache.commons.io.FileUtils;
@@ -219,6 +220,8 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
         sapfor = new File(target.workspace, Utils.getDateName("SAPFOR_F") + (Global.isWindows ? ".exe" : "")); //развилка на линукс
         ShowMessage2("Копирование SAPFOR");
         FileUtils.copyFile(Current.getSapfor().getFile(), sapfor);
+        if (!sapfor.setExecutable(true))
+            throw new PassException("Не удалось сделать файл " + sapfor.getName() + " исполняемым!");
         ShowMessage2("Копирование визуализатора");
         File visualiser = new File(target.workspace, "VisualSapfor.jar");
         FileUtils.copyFile(Global.visualiser.getFile(), visualiser);