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

промежутоный. все же, вывел число ядер в конфигурации. иначе автоматическое тестирование обзаведется лишней настройкой.

Browse Source
This commit is contained in:
02090095
2024-09-20 01:52:39 +03:00
parent ae379ea196
commit 12c4eaf33d
19 changed files with 176 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Visual_DVM_2021/Passes/All/CloneCurrentDVMConfiguration.java Normal file
View File

@@ -0,0 +1,5 @@
package Visual_DVM_2021.Passes.All;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import Visual_DVM_2021.Passes.Pass_2021;
public class CloneCurrentDVMConfiguration extends Pass_2021<DVMConfiguration> {
}

2
src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
View File

@@ -61,7 +61,7 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
target.drv = Current.getCompiler().call_command;
target.version = Current.getCompiler().getVersionInfo();
//--
target.kernels = Global.properties.TestingKernels;
target.kernels = 1; //Global.properties.TestingKernels;
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.tasksCount = 0;

4
src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
View File

@@ -135,12 +135,12 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
//-
target.drv = Current.getServerSapfor().call_command;
target.version = Current.getServerSapfor().version;
target.kernels = Global.properties.TestingKernels;
target.kernels = 1; //Global.properties.TestingKernels;
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.sapforId = Current.getServerSapfor().id;
//--
target.kernels = Global.properties.TestingKernels;
target.kernels =1; // Global.properties.TestingKernels;
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.package_json = new SapforPackage_json();

11
src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java
View File

@@ -135,13 +135,17 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
if (!Current.getCompiler().versionLoaded)
passes.get(PassCode_2021.ShowCompilerVersion).Do(Current.getCompiler(), false);
//--
int max_kernels = 1;
for (DVMConfiguration configuration : configurations){
max_kernels = Math.max(configuration.kernels, max_kernels);
}
target = new DVMPackage(
Current.getAccount(),
Current.getMachine(),
Current.getUser(),
Current.getCompiler()
Current.getCompiler(),
max_kernels
);
//----
for (DVMConfiguration configuration : configurations) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(configuration);
groups = cache.getGroups();
@@ -162,6 +166,9 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
tasks.addAll(createTasksCGT(configuration, group, test));
}
}
//----
if (tasks_count == 0) {
Log.Writeln_("Задач не найдено.");
return false;

4
src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java
View File

@@ -182,7 +182,9 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
Log.Writeln_("Не отмечено ни одной конфигурации, или отсутствует текущая конфигурация.");
return false;
}
int max_kernels = 1;
for (SapforConfiguration configuration : configurations) {
max_kernels = Math.max(configuration.kernels, max_kernels);
if (!checkConfigurationCommands(configuration))
return false;
//-
@@ -216,7 +218,7 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
//-
}
}
target = new SapforPackage(Current.getAccount(), Current.getServerSapfor());
target = new SapforPackage(Current.getAccount(), Current.getServerSapfor(), max_kernels);
//--
testingSet = new SapforTestingSet_json();
testingSet.id = target.package_json.getMaxSetId();

10
src/Visual_DVM_2021/Passes/CloneConfiguration.java Normal file
View File

@@ -0,0 +1,10 @@
package Visual_DVM_2021.Passes;
import Common.Global;
import TestingSystem.Common.Configuration.Configuration;
import TestingSystem.Common.TestingServer;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class CloneConfiguration<C extends Configuration> extends PublishServerObject<TestingServer, C> {
public CloneConfiguration(Class<C> d_in) {
super(Global.testingServer, d_in);
}
}

4
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -344,12 +344,16 @@ public enum PassCode_2021 {
ShowCurrentSAPFORConfigurationTests,
SaveCurrentSAPFORConfiguration,
StartSelectedSAPFORConfigurations,
CloneCurrentDVMConfiguration,
;
//--
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case CloneCurrentDVMConfiguration:
return "Дублировать текущую конфигурацию тестирования DVM системы";
case StartSelectedSAPFORConfigurations:
return "Запустить отмеченные конфигурации тестирования системы SAPFOR";
case SaveCurrentSAPFORConfiguration: