fix
This commit is contained in:
2025-03-15 16:06:44 +03:00
parent 55aa66fa18
commit 6a3be45b1a
6 changed files with 23 additions and 23 deletions

View File

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
import java.util.Vector;
public class Constants {
public static final int version = 1213;
public static final int version = 1214;
public static final int planner_version = 24;
public static final int testingMaxKernels = 64;
//--

View File

@@ -15,13 +15,13 @@ public enum TaskState implements StatusEnum {
Finished,
//--- результирующие
DoneWithErrors,
DoneWithDiffs,
AbortedByTimeout,
AbortedByUser,
Crushed,
WrongTestFormat,
InternalError,
Done,
DoneWithDiffs,
//--- сугубо кластерные.
Queued,
NoSuchTask,

View File

@@ -148,7 +148,18 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
if (Global.normalProperties.CreateEthalonTasks &&
!group.type.equals(TestType.Performance)) {
if (ethalon == null) {
compilationTasks.add(compilationTask = new DVMCompilationTask(index, configuration, "-s", group, test));
String options_ = "-s";
String environments_ = "";
if (Global.normalProperties.CompleteCompilationOptions)
options_ = completeOptions(options_);
if (Global.normalProperties.CompleteRunEnvironments)
environments_ = completeEnvironments(environments_);
compilationTasks.add(compilationTask = new DVMCompilationTask(
index, configuration,
options_,
group, test));
compilationTask.runTasks.add(ethalon = new DVMRunTask(
index,
compilationTask,
@@ -158,7 +169,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
group,
test,
"",
"-s", "",
options_, environments_,
kernels));
tasksCount++;
}

View File

@@ -63,14 +63,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
return RendererStatusEnum.class;
}
},
/*
new ColumnInfo<DVMRunTask>("эталон") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.ethalon_id;
}
},
*/
new ColumnInfo<DVMRunTask>("Матрица") {
@Override
public Object getFieldAt(DVMRunTask object) {
@@ -204,11 +196,4 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
super.ShowNoCurrentObject();
Global.mainModule.getUI().getMainWindow().getTestingWindow().ShowNoCurrentDVMTask();
}
/*
@Override
protected void MouseAction2() throws Exception {
SelectAll(false);
Global.mainModule.getPass(PassCode.CompareDVMRunTasks).Do();
}
*/
}