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
2023-11-19 18:49:50 +03:00
parent 28908bcfac
commit fda62702fe
14 changed files with 123 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Visual_DVM_2021/Passes/All/StartTests.java
View File

@@ -7,12 +7,11 @@ import GlobalData.Machine.MachineType;
import GlobalData.User.UserState;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.DVM.Configuration.ConfigurationInterface;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.DVM.TasksPackage.TasksPackage;
import TestingSystem.Common.Test.Test;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
@@ -79,7 +78,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
Test test
) {
Vector<TestCompilationTask> compilationTasks = new Vector<>();
for (String flags : ConfigurationInterface.getFlags(configuration)) {
for (String flags : configuration.getFlags()) {
TestCompilationTask testCompilationTask = new TestCompilationTask(
configuration,
group,
@@ -87,8 +86,8 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
flags
);
testCompilationTask.runTasks = new Vector<>();
Vector<String> matrixes = ConfigurationInterface.getMatrixes(configuration, test.dim);
Vector<String> environments = ConfigurationInterface.getEnvironments(configuration);
Vector<String> matrixes = configuration.getMatrixes(test.dim);
Vector<String> environments = configuration.getEnvironments();
for (String environmentSet : environments) {
if (flags.trim().equalsIgnoreCase("-s")) {
testCompilationTask.runTasks.add(new TestRunTask(
@@ -98,7 +97,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
"",
flags,
environmentSet,
ConfigurationInterface.getParamsText(configuration)
configuration.getParamsText()
));
} else
for (String matrix : matrixes) {
@@ -109,7 +108,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
matrix,
flags,
environmentSet,
ConfigurationInterface.getParamsText(configuration)));
configuration.getParamsText()));
}
}
compilationTasks.add(testCompilationTask);
@@ -145,7 +144,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
//2 Проверяем выбраны ли группы.
configurations_lines.add("Конфигурации: ");
for (TestingSystem.DVM.Configuration.Configuration configuration : server.db.configurations.getCheckedItems()) {
configurations_lines.add(ConfigurationInterface.getSummary(configuration));
configurations_lines.add(configuration.getSummary());
groups_lines.add("Группы: ");
for (Group group : server.db.groups.getCheckedItems()) {
groups_lines.add(group.getSummary());