This commit is contained in:
2023-12-02 17:52:12 +03:00
parent b1476c74d4
commit bd74d4684f
4 changed files with 27 additions and 22 deletions

View File

@@ -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);