M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

++

Browse Source 
fix
This commit is contained in:
02090095
2025-03-15 16:06:44 +03:00
parent 55aa66fa18
commit 6a3be45b1a
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -7,8 +7,12 @@
</component>
<component name="ChangeListManager">
<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$/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/GlobalData/Tasks/TaskState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/TaskState.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/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -59,7 +63,7 @@
<option name="stateVersion" value="1" />
</component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="ProjectErrors" />
<option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectId" id="1UqWSAGBQQNofrCLxSPPtOZrGP7" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">

6
properties
View File

@@ -18,7 +18,7 @@
"FocusPassesResult": true,
"collapseCredentials": true,
"collapseFileGraphs": false,
"collapseFileMessages": false,
"collapseFileMessages": true,
"collapseProjectTrees": false,
"EditorFontSize": 17,
"ComponentsWindowWidth": 929,
@@ -28,8 +28,8 @@
"CheckTestingIntervalSeconds": 10,
"AutoCheckTesting": true,
"EmailOnTestingProgress": true,
"CompleteCompilationOptions": false,
"CompleteRunEnvironments": false,
"CompleteCompilationOptions": true,
"CompleteRunEnvironments": true,
"CreateEthalonTasks": true,
"ErasePackageWorkspace": true,
"lastMachineId": 28,

2
src/_VisualDVM/Constants.java
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;
//--

2
src/_VisualDVM/GlobalData/Tasks/TaskState.java
View File

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

15
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
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++;
}

15
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
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();
}
*/
}