fix. был внесенный баг с проверкой конфигураций тестирования на корректность.
This commit is contained in:
9
.idea/workspace.xml
generated
9
.idea/workspace.xml
generated
@@ -7,14 +7,11 @@
|
|||||||
</component>
|
</component>
|
||||||
<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 afterPath="$PROJECT_DIR$/src/Common/Passes/PassCode_.java" afterDir="false" />
|
|
||||||
<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/Common/Utils/Passes/PassCode_.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Passes/Pass_.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode.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/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" 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" />
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package Visual_DVM_2021.Passes;
|
package Visual_DVM_2021.Passes;
|
||||||
import Common.Passes.PassCode_;
|
import Common.Passes.PassCode_;
|
||||||
import _VisualDVM.Constants;
|
|
||||||
public enum PassCode implements PassCode_ {
|
public enum PassCode implements PassCode_ {
|
||||||
//-
|
//-
|
||||||
UpdateProperty,
|
UpdateProperty,
|
||||||
@@ -1049,10 +1048,22 @@ public enum PassCode implements PassCode_ {
|
|||||||
return p + " " + name;
|
return p + " " + name;
|
||||||
}
|
}
|
||||||
public boolean isSapforStart(){
|
public boolean isSapforStart(){
|
||||||
return Constants.startSapforCodes.contains(this);
|
switch (this){
|
||||||
|
case SPF_InsertIncludesPass:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
public boolean isSapforTerminal(){
|
public boolean isSapforTerminal(){
|
||||||
return Constants.terminalSapforCodes.contains(this);
|
switch (this){
|
||||||
|
case CreateParallelVariants:
|
||||||
|
case SPF_SharedMemoryParallelization:
|
||||||
|
case SPF_InsertDvmhRegions:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -51,14 +51,6 @@ public class Constants {
|
|||||||
public static final String package_json = "package_json";
|
public static final String package_json = "package_json";
|
||||||
public static final String results_json = "results_json";
|
public static final String results_json = "results_json";
|
||||||
//--
|
//--
|
||||||
public static final Vector<PassCode> startSapforCodes =
|
|
||||||
new Vector_<>(PassCode.SPF_InsertIncludesPass);
|
|
||||||
|
|
||||||
public static final Vector<PassCode> terminalSapforCodes =
|
|
||||||
new Vector_<>( PassCode.CreateParallelVariants,
|
|
||||||
PassCode.SPF_SharedMemoryParallelization,
|
|
||||||
PassCode.SPF_InsertDvmhRegions);
|
|
||||||
//---
|
|
||||||
public static final int parser_group = -1;
|
public static final int parser_group = -1;
|
||||||
public static final int compiler_group = -2;
|
public static final int compiler_group = -2;
|
||||||
// DBProjectFile
|
// DBProjectFile
|
||||||
|
|||||||
@@ -15,6 +15,6 @@ public class SapforConfigurationCache extends ConfigurationCache{
|
|||||||
if (Global.testingServer.db.sapforSettings.containsKey(settingsJson.id))
|
if (Global.testingServer.db.sapforSettings.containsKey(settingsJson.id))
|
||||||
res.add(Global.testingServer.db.sapforSettings.get(settingsJson.id));
|
res.add(Global.testingServer.db.sapforSettings.get(settingsJson.id));
|
||||||
}
|
}
|
||||||
return res;
|
return res;//System.out.println(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
|
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
|
||||||
|
import Common.Visual.CommonUI;
|
||||||
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
|
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
|
||||||
|
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
|
||||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||||
import Common.Utils.TextLog;
|
import Common.Utils.TextLog;
|
||||||
import _VisualDVM.ProjectData.LanguageName;
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
@@ -16,21 +18,22 @@ public class SapforConfiguration extends Configuration {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public boolean validate(TextLog Log) {
|
public boolean validate(TextLog Log) {
|
||||||
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(this);
|
SapforConfigurationCache cache = (SapforConfigurationCache) VisualCaches.GetCache(this);
|
||||||
//--
|
//--
|
||||||
Vector<Group> groups = cache.getGroups();
|
Vector<Group> groups = cache.getGroups();
|
||||||
|
Vector<SapforSettings> settingsArray= cache.getSettings();
|
||||||
|
//--
|
||||||
Vector<LanguageName> groupsLanguages = new Vector<>();
|
Vector<LanguageName> groupsLanguages = new Vector<>();
|
||||||
Vector<SapforSettings> settingsArray= new Vector<>();
|
for (Group group : groups) {
|
||||||
//-
|
if (!groupsLanguages.contains(group.language))
|
||||||
|
groupsLanguages.add(group.language);
|
||||||
|
}
|
||||||
|
//---
|
||||||
//1. проверка цепочек команд на корректность
|
//1. проверка цепочек команд на корректность
|
||||||
for (SapforSettings sapforSettings: settingsArray){
|
for (SapforSettings sapforSettings: settingsArray){
|
||||||
sapforSettings.validate(Log);
|
sapforSettings.validate(Log);
|
||||||
}
|
}
|
||||||
//2. Проверка входящих групп на единственный язык фортран
|
//2. Проверка входящих групп на единственный язык фортран
|
||||||
for (Group group : groups) {
|
|
||||||
if (!groupsLanguages.contains(group.language))
|
|
||||||
groupsLanguages.add(group.language);
|
|
||||||
}
|
|
||||||
if (groupsLanguages.size()>1){
|
if (groupsLanguages.size()>1){
|
||||||
Log.Writeln_("Запуск тестов на разных языках в рамках одного пакета запрещен!\n");
|
Log.Writeln_("Запуск тестов на разных языках в рамках одного пакета запрещен!\n");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
|
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Utils.CommonUtils;
|
import Common.Utils.CommonUtils;
|
||||||
|
import Common.Visual.CommonUI;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import Common.Utils.TextLog;
|
import Common.Utils.TextLog;
|
||||||
import _VisualDVM.TestingSystem.Common.Settings.Settings;
|
import _VisualDVM.TestingSystem.Common.Settings.Settings;
|
||||||
|
|||||||
Reference in New Issue
Block a user