фикс бага с синхронизацией тестов из репозитория. забыл поменять почту со своей на серверную и они качались заново и множились.
начал внедрение эталонов ++
This commit is contained in:
16
.idea/workspace.xml
generated
16
.idea/workspace.xml
generated
@@ -8,21 +8,17 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/TestingMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/TestingMenu.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/TestingMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/TestingMenu.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/files/File.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/File.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/files/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Supervisor.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/files/Task.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Task.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/files/starter.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/starter.cpp" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
"EmailOnTestingProgress": true,
|
"EmailOnTestingProgress": true,
|
||||||
"CompleteCompilationOptions": false,
|
"CompleteCompilationOptions": false,
|
||||||
"CompleteRunEnvironments": false,
|
"CompleteRunEnvironments": false,
|
||||||
|
"CreateEthalonTasks": true,
|
||||||
"ErasePackageWorkspace": true,
|
"ErasePackageWorkspace": true,
|
||||||
"lastMachineId": 28,
|
"lastMachineId": 28,
|
||||||
"lastUserId": 36,
|
"lastUserId": 36,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
|||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class Constants {
|
public class Constants {
|
||||||
public static final int version = 1210;
|
public static final int version = 1211;
|
||||||
public static final int planner_version = 24;
|
public static final int planner_version = 24;
|
||||||
public static final int testingMaxKernels = 64;
|
public static final int testingMaxKernels = 64;
|
||||||
//--
|
//--
|
||||||
|
|||||||
@@ -77,6 +77,8 @@ public class NormalProperties extends VisualDVMProperties {
|
|||||||
@Expose
|
@Expose
|
||||||
public boolean CompleteRunEnvironments = true;
|
public boolean CompleteRunEnvironments = true;
|
||||||
@Expose
|
@Expose
|
||||||
|
public boolean CreateEthalonTasks = true;
|
||||||
|
@Expose
|
||||||
public boolean ErasePackageWorkspace = true;
|
public boolean ErasePackageWorkspace = true;
|
||||||
//--
|
//--
|
||||||
@Expose
|
@Expose
|
||||||
@@ -127,6 +129,8 @@ public class NormalProperties extends VisualDVMProperties {
|
|||||||
return "Дополнение опций компиляции";
|
return "Дополнение опций компиляции";
|
||||||
case "CompleteRunEnvironments":
|
case "CompleteRunEnvironments":
|
||||||
return "Дополнение переменных окружения запуска";
|
return "Дополнение переменных окружения запуска";
|
||||||
|
case "CreateEthalonTasks":
|
||||||
|
return "Создание эталонных последовательных запусков";
|
||||||
case "OfferRegistrationOnStart":
|
case "OfferRegistrationOnStart":
|
||||||
return "Проверка регистрации";
|
return "Проверка регистрации";
|
||||||
case "Email":
|
case "Email":
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
|
|||||||
import Common.Database.Tables.FKDataBehaviour;
|
import Common.Database.Tables.FKDataBehaviour;
|
||||||
import Common.Database.Tables.iDBTable;
|
import Common.Database.Tables.iDBTable;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.ProjectData.LanguageName;
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
|
import _VisualDVM.TestingSystem.Common.Group.UI.GroupsForm;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
@@ -44,7 +45,7 @@ public class GroupsDBTable extends iDBTable<Group> {
|
|||||||
}
|
}
|
||||||
public Group getGroupByDescription(LanguageName language_in, String description_in) {
|
public Group getGroupByDescription(LanguageName language_in, String description_in) {
|
||||||
for (Group group : Data.values()) {
|
for (Group group : Data.values()) {
|
||||||
if (group.sender_address.equals("vmk-post@yandex.ru") &&
|
if (group.sender_address.equals(Constants.MailAddress) &&
|
||||||
group.language.equals(language_in) && group.description.equalsIgnoreCase(description_in))
|
group.language.equals(language_in) && group.description.equalsIgnoreCase(description_in))
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package _VisualDVM.TestingSystem.DVM.DVMPackage;
|
package _VisualDVM.TestingSystem.DVM.DVMPackage;
|
||||||
import Common.CommonConstants;
|
import Common.CommonConstants;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
|
import Common.Utils.Index;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
@@ -68,6 +69,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
|||||||
kernels = Math.max(configuration.kernels, kernels);
|
kernels = Math.max(configuration.kernels, kernels);
|
||||||
//-
|
//-
|
||||||
tasksCount = 0;
|
tasksCount = 0;
|
||||||
|
Index index = new Index();
|
||||||
Vector<DVMCompilationTask> compilationTasks = new Vector<DVMCompilationTask>();
|
Vector<DVMCompilationTask> compilationTasks = new Vector<DVMCompilationTask>();
|
||||||
for (DVMConfiguration configuration : configurations) {
|
for (DVMConfiguration configuration : configurations) {
|
||||||
DVMConfigurationCache cache = (DVMConfigurationCache) VisualCaches.GetCache(configuration);
|
DVMConfigurationCache cache = (DVMConfigurationCache) VisualCaches.GetCache(configuration);
|
||||||
@@ -77,6 +79,13 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
|||||||
//---
|
//---
|
||||||
DVMSettingsCache settingsCache = (DVMSettingsCache) VisualCaches.GetCache(dvmSettings);
|
DVMSettingsCache settingsCache = (DVMSettingsCache) VisualCaches.GetCache(dvmSettings);
|
||||||
Vector<Pair<String, String>> params = settingsCache.getTasksParameters();
|
Vector<Pair<String, String>> params = settingsCache.getTasksParameters();
|
||||||
|
//--
|
||||||
|
/*
|
||||||
|
if (Global.normalProperties.CreateEthalonTasks){
|
||||||
|
params.insertElementAt(new Pair<>("-s", ""),0);
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
//--
|
||||||
//---
|
//---
|
||||||
for (Pair<String, String> p : params) {
|
for (Pair<String, String> p : params) {
|
||||||
//--
|
//--
|
||||||
@@ -86,12 +95,15 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
|||||||
completeEnvironments(p.getValue()) : p.getValue();
|
completeEnvironments(p.getValue()) : p.getValue();
|
||||||
//--
|
//--
|
||||||
DVMCompilationTask compilationTask =
|
DVMCompilationTask compilationTask =
|
||||||
new DVMCompilationTask(configuration, options_, group, test);
|
new DVMCompilationTask(index,configuration, options_, group, test);
|
||||||
compilationTasks.add(compilationTask);
|
compilationTasks.add(compilationTask);
|
||||||
//--
|
//--
|
||||||
|
DVMRunTask ethalon=null;
|
||||||
Vector<String> matrixes = dvmSettings.getMatrixes(test.max_dim);
|
Vector<String> matrixes = dvmSettings.getMatrixes(test.max_dim);
|
||||||
if (p.getKey().trim().equalsIgnoreCase("-s")) {
|
if (p.getKey().trim().equalsIgnoreCase("-s")) {
|
||||||
compilationTask.runTasks.add(new DVMRunTask(
|
compilationTask.runTasks.add(new DVMRunTask(
|
||||||
|
index,
|
||||||
|
compilationTask,
|
||||||
configuration,
|
configuration,
|
||||||
dvmSettings,
|
dvmSettings,
|
||||||
group,
|
group,
|
||||||
@@ -104,6 +116,8 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
|
|||||||
} else {
|
} else {
|
||||||
for (String matrix : matrixes) {
|
for (String matrix : matrixes) {
|
||||||
compilationTask.runTasks.add(new DVMRunTask(
|
compilationTask.runTasks.add(new DVMRunTask(
|
||||||
|
index,
|
||||||
|
compilationTask,
|
||||||
configuration,
|
configuration,
|
||||||
dvmSettings,
|
dvmSettings,
|
||||||
group,
|
group,
|
||||||
|
|||||||
@@ -7,24 +7,11 @@ import java.io.Serializable;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class DVMPackage_json implements Serializable {
|
public class DVMPackage_json implements Serializable {
|
||||||
@Expose
|
|
||||||
public int max_task_id = 0;
|
|
||||||
@Expose
|
@Expose
|
||||||
public List<DVMCompilationTask> compilationTasks = new Vector<>();
|
public List<DVMCompilationTask> compilationTasks = new Vector<>();
|
||||||
public DVMPackage_json() {
|
public DVMPackage_json() {
|
||||||
}
|
}
|
||||||
public DVMPackage_json(List<DVMCompilationTask> tasks) {
|
public DVMPackage_json(List<DVMCompilationTask> tasks) {
|
||||||
for (DVMCompilationTask compilationTask : tasks) {
|
|
||||||
compilationTask.id = getMaxTaskId();
|
|
||||||
//-
|
|
||||||
for (DVMRunTask runTask : compilationTask.runTasks) {
|
|
||||||
runTask.id = getMaxTaskId();
|
|
||||||
runTask.dvmcompilationtask_id = compilationTask.id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
compilationTasks.addAll(tasks);
|
compilationTasks.addAll(tasks);
|
||||||
}
|
}
|
||||||
public int getMaxTaskId() {
|
|
||||||
return max_task_id++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
package _VisualDVM.TestingSystem.DVM.DVMTasks;
|
package _VisualDVM.TestingSystem.DVM.DVMTasks;
|
||||||
|
import Common.Utils.Index;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||||
@@ -13,8 +14,8 @@ public class DVMCompilationTask extends DVMTask {
|
|||||||
public DVMCompilationTask() {
|
public DVMCompilationTask() {
|
||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
public DVMCompilationTask(DVMConfiguration configuration, String flags_in, Group group, Test test) {
|
public DVMCompilationTask(Index index,DVMConfiguration configuration, String flags_in, Group group, Test test) {
|
||||||
super(configuration, group, test, flags_in);
|
super(index,configuration, group, test, flags_in);
|
||||||
maxtime = configuration.c_maxtime;
|
maxtime = configuration.c_maxtime;
|
||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package _VisualDVM.TestingSystem.DVM.DVMTasks;
|
package _VisualDVM.TestingSystem.DVM.DVMTasks;
|
||||||
import Common.CommonConstants;
|
import Common.CommonConstants;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
|
import Common.Utils.Index;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Tasks.TaskState;
|
import _VisualDVM.GlobalData.Tasks.TaskState;
|
||||||
@@ -19,6 +20,8 @@ public class DVMRunTask extends DVMTask {
|
|||||||
@Expose
|
@Expose
|
||||||
public int dvmcompilationtask_id = CommonConstants.Nan;
|
public int dvmcompilationtask_id = CommonConstants.Nan;
|
||||||
@Expose
|
@Expose
|
||||||
|
public int ethalon_id = CommonConstants.Nan; //эталон если есть.
|
||||||
|
@Expose
|
||||||
public String matrix = "";
|
public String matrix = "";
|
||||||
@Expose
|
@Expose
|
||||||
public String args = "";
|
public String args = "";
|
||||||
@@ -38,14 +41,17 @@ public class DVMRunTask extends DVMTask {
|
|||||||
public TaskState compilation_state = TaskState.Waiting;
|
public TaskState compilation_state = TaskState.Waiting;
|
||||||
@Expose
|
@Expose
|
||||||
public double compilation_time = 0.0;
|
public double compilation_time = 0.0;
|
||||||
public DVMRunTask(DVMConfiguration configuration, DVMSettings settings,
|
public DVMRunTask(Index index,
|
||||||
|
DVMCompilationTask dvmCompilationTask,
|
||||||
|
DVMConfiguration configuration, DVMSettings settings,
|
||||||
Group group, Test test,
|
Group group, Test test,
|
||||||
String matrix_in, String flags_in,
|
String matrix_in, String flags_in,
|
||||||
String environments_in,
|
String environments_in,
|
||||||
int kernels_in
|
int kernels_in
|
||||||
) {
|
) {
|
||||||
super(configuration, group, test, flags_in);
|
super(index,configuration, group, test, flags_in);
|
||||||
//--------------------------
|
//--------------------------
|
||||||
|
dvmcompilationtask_id = dvmCompilationTask.id;
|
||||||
//инфа о компиляции.
|
//инфа о компиляции.
|
||||||
compilation_maxtime = configuration.c_maxtime;
|
compilation_maxtime = configuration.c_maxtime;
|
||||||
compilation_state = TaskState.Waiting;
|
compilation_state = TaskState.Waiting;
|
||||||
@@ -70,6 +76,7 @@ public class DVMRunTask extends DVMTask {
|
|||||||
super.SynchronizeFields(src);
|
super.SynchronizeFields(src);
|
||||||
DVMRunTask rt = (DVMRunTask) src;
|
DVMRunTask rt = (DVMRunTask) src;
|
||||||
dvmcompilationtask_id = rt.dvmcompilationtask_id;
|
dvmcompilationtask_id = rt.dvmcompilationtask_id;
|
||||||
|
ethalon_id = rt.ethalon_id;
|
||||||
matrix = rt.matrix;
|
matrix = rt.matrix;
|
||||||
CleanTime = rt.CleanTime;
|
CleanTime = rt.CleanTime;
|
||||||
progress = rt.progress;
|
progress = rt.progress;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMTasks;
|
|||||||
import Common.CommonConstants;
|
import Common.CommonConstants;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Database.Objects.iDBObject;
|
import Common.Database.Objects.iDBObject;
|
||||||
|
import Common.Utils.Index;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Tasks.TaskState;
|
import _VisualDVM.GlobalData.Tasks.TaskState;
|
||||||
@@ -47,8 +48,9 @@ public class DVMTask extends iDBObject {
|
|||||||
}
|
}
|
||||||
public DVMTask() {
|
public DVMTask() {
|
||||||
}
|
}
|
||||||
public DVMTask(DVMConfiguration configuration,
|
public DVMTask(Index index, DVMConfiguration configuration,
|
||||||
Group group, Test test, String flags_in) {
|
Group group, Test test, String flags_in) {
|
||||||
|
id = index.Inc();
|
||||||
group_id = group.id;
|
group_id = group.id;
|
||||||
test_id = test.id;
|
test_id = test.id;
|
||||||
group_description = group.description;
|
group_description = group.description;
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ public class MainUI extends UIModule_ {
|
|||||||
getMainWindow().getCallbackWindow().showNoBugReports();
|
getMainWindow().getCallbackWindow().showNoBugReports();
|
||||||
Global.normalProperties.setControlVisible("AutoBugReportsLoad", false);
|
Global.normalProperties.setControlVisible("AutoBugReportsLoad", false);
|
||||||
Global.normalProperties.setControlVisible("AutoTestsLoad", false);
|
Global.normalProperties.setControlVisible("AutoTestsLoad", false);
|
||||||
|
Global.normalProperties.setControlVisible("CreateEthalonTasks", false);
|
||||||
Global.normalProperties.setControlVisible("CompleteCompilationOptions", false);
|
Global.normalProperties.setControlVisible("CompleteCompilationOptions", false);
|
||||||
Global.normalProperties.setControlVisible("CompleteRunEnvironments", false);
|
Global.normalProperties.setControlVisible("CompleteRunEnvironments", false);
|
||||||
Global.normalProperties.setControlVisible("ErasePackageWorkspace", false);
|
Global.normalProperties.setControlVisible("ErasePackageWorkspace", false);
|
||||||
@@ -121,6 +122,7 @@ public class MainUI extends UIModule_ {
|
|||||||
getMainWindow().getCallbackWindow().showMyOnlyBugReports();
|
getMainWindow().getCallbackWindow().showMyOnlyBugReports();
|
||||||
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
|
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
|
||||||
Global.normalProperties.setControlVisible("AutoTestsLoad", false);
|
Global.normalProperties.setControlVisible("AutoTestsLoad", false);
|
||||||
|
Global.normalProperties.setControlVisible("CreateEthalonTasks", false);
|
||||||
Global.normalProperties.setControlVisible("CompleteCompilationOptions", false);
|
Global.normalProperties.setControlVisible("CompleteCompilationOptions", false);
|
||||||
Global.normalProperties.setControlVisible("CompleteRunEnvironments", false);
|
Global.normalProperties.setControlVisible("CompleteRunEnvironments", false);
|
||||||
Global.normalProperties.setControlVisible("ErasePackageWorkspace", false);
|
Global.normalProperties.setControlVisible("ErasePackageWorkspace", false);
|
||||||
@@ -135,6 +137,7 @@ public class MainUI extends UIModule_ {
|
|||||||
getMainWindow().getCallbackWindow().showAllBugreports();
|
getMainWindow().getCallbackWindow().showAllBugreports();
|
||||||
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
|
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
|
||||||
Global.normalProperties.setControlVisible("AutoTestsLoad", true);
|
Global.normalProperties.setControlVisible("AutoTestsLoad", true);
|
||||||
|
Global.normalProperties.setControlVisible("CreateEthalonTasks", true);
|
||||||
Global.normalProperties.setControlVisible("CompleteCompilationOptions", true);
|
Global.normalProperties.setControlVisible("CompleteCompilationOptions", true);
|
||||||
Global.normalProperties.setControlVisible("CompleteRunEnvironments", true);
|
Global.normalProperties.setControlVisible("CompleteRunEnvironments", true);
|
||||||
Global.normalProperties.setControlVisible("ErasePackageWorkspace", true);
|
Global.normalProperties.setControlVisible("ErasePackageWorkspace", true);
|
||||||
@@ -146,6 +149,7 @@ public class MainUI extends UIModule_ {
|
|||||||
getMainWindow().getCallbackWindow().showAllBugReportsAdmin(); //метод избыточный. возможно.
|
getMainWindow().getCallbackWindow().showAllBugReportsAdmin(); //метод избыточный. возможно.
|
||||||
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
|
Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
|
||||||
Global.normalProperties.setControlVisible("AutoTestsLoad", true);
|
Global.normalProperties.setControlVisible("AutoTestsLoad", true);
|
||||||
|
Global.normalProperties.setControlVisible("CreateEthalonTasks", true);
|
||||||
Global.normalProperties.setControlVisible("CompleteCompilationOptions", true);
|
Global.normalProperties.setControlVisible("CompleteCompilationOptions", true);
|
||||||
Global.normalProperties.setControlVisible("CompleteRunEnvironments", true);
|
Global.normalProperties.setControlVisible("CompleteRunEnvironments", true);
|
||||||
Global.normalProperties.setControlVisible("ErasePackageWorkspace", true);
|
Global.normalProperties.setControlVisible("ErasePackageWorkspace", true);
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ public class TestingMenu extends PropertiesSubmenu {
|
|||||||
public TestingMenu() {
|
public TestingMenu() {
|
||||||
super("Тестирование", null,
|
super("Тестирование", null,
|
||||||
Global.normalProperties,
|
Global.normalProperties,
|
||||||
|
"CreateEthalonTasks",
|
||||||
"CompleteCompilationOptions",
|
"CompleteCompilationOptions",
|
||||||
"CompleteRunEnvironments",
|
"CompleteRunEnvironments",
|
||||||
"ErasePackageWorkspace"
|
"ErasePackageWorkspace"
|
||||||
|
|||||||
Reference in New Issue
Block a user