no message
This commit is contained in:
@@ -13,7 +13,7 @@ import Repository.Component.Sapfor.MessagesServer;
|
||||
import Repository.Component.Sapfor.Sapfor_F;
|
||||
import Repository.Component.Sapfor.TransformationPermission;
|
||||
import Repository.Server.ComponentsServer;
|
||||
import SapforTestingSystem.SapforTestingPlaner.SapforTestingPlanner;
|
||||
import SapforTestingSystem.SapforScenarioSupervisor.SapforScenarioSupervisor;
|
||||
import TestingSystem.TestingServer;
|
||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import Visual_DVM_2021.Passes.Pass_2021;
|
||||
@@ -360,7 +360,7 @@ public class Global {
|
||||
}
|
||||
};
|
||||
Log.ClearLog();
|
||||
SapforTestingPlanner planner = new SapforTestingPlanner();
|
||||
SapforScenarioSupervisor planner = new SapforScenarioSupervisor();
|
||||
planner.Start();
|
||||
}
|
||||
//---
|
||||
|
||||
@@ -147,7 +147,10 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
|
||||
}
|
||||
protected void variants() throws Exception {
|
||||
//папки вариантов создается самим сапфором.
|
||||
target.state = performSapforScript("create_variants", parentTask, " -t 13 -allVars -tinfo",
|
||||
target.state = performSapforScript("create_variants", parentTask, " -t 13 -allVars"
|
||||
+ " -tinfo"
|
||||
,
|
||||
|
||||
Constants.out_file,
|
||||
Constants.err_file
|
||||
) ? TaskState.Done : TaskState.DoneWithErrors;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package SapforTestingSystem.SapforTestingPlaner;
|
||||
package SapforTestingSystem.SapforScenarioSupervisor;
|
||||
import Common.Constants;
|
||||
import Common.Global;
|
||||
import Common.Utils.Utils;
|
||||
@@ -12,10 +12,10 @@ import org.apache.commons.io.FileUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
public class SapforTestingPlanner extends ThreadsPlanner {
|
||||
public class SapforScenarioSupervisor extends ThreadsPlanner {
|
||||
PackageModeScenario_json scenario_json = null;
|
||||
SapforScenarioResults_json results_json = new SapforScenarioResults_json();
|
||||
public SapforTestingPlanner() throws Exception {
|
||||
public SapforScenarioSupervisor() throws Exception {
|
||||
super(Global.properties.threadsTimeout, Global.properties.threadsNum);
|
||||
scenario_json = (PackageModeScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario"), PackageModeScenario_json.class);
|
||||
results_json.StartDate = new Date().getTime();
|
||||
@@ -59,7 +59,7 @@ public class SapforTestingPlanner extends ThreadsPlanner {
|
||||
Utils.jsonToFile(results_json, new File(Global.Home, "results"));
|
||||
// System.out.println("Очистка служебных файлов");
|
||||
//тут же и строить версии.
|
||||
Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep", "bat","sh"); //Потом txt тоже добавить.
|
||||
Utils.deleteFilesByExtensions(new File(Global.Home),"proj","dep"); //Потом txt тоже добавить.
|
||||
FileUtils.writeStringToFile(new File(Constants.DONE), "");
|
||||
} catch (Exception e) {
|
||||
Global.Log.PrintException(e);
|
||||
@@ -0,0 +1,6 @@
|
||||
package SapforTestingSystem.ServerSapforTestingPlanner;
|
||||
public class ServerSapforTestingPlanner {
|
||||
public void Perform(){
|
||||
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,7 @@ import SapforTestingSystem.SapforConfiguration.SapforConfigurationInterface;
|
||||
import SapforTestingSystem.SapforScenario.SapforScenario;
|
||||
import SapforTestingSystem.SapforServerScenario_info;
|
||||
import SapforTestingSystem.ServerSapfor.ServerSapfor;
|
||||
import SapforTestingSystem.ServerSapforTestingPlanner.ServerSapforTestingPlanner;
|
||||
import TestingSystem.Group.Group;
|
||||
import TestingSystem.Group.GroupInterface;
|
||||
import TestingSystem.Tasks.TestCompilationTask;
|
||||
@@ -222,6 +223,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
}
|
||||
protected TestingPlanner testingPlanner = new TestingPlanner();
|
||||
protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
|
||||
protected ServerSapforTestingPlanner sapforTestingPlanner = new ServerSapforTestingPlanner();
|
||||
protected Thread sapforTestingThread = new Thread(()-> sapforTestingPlanner.Perform());
|
||||
//------>>>
|
||||
public static boolean checkTasks = false;
|
||||
//--
|
||||
|
||||
Reference in New Issue
Block a user