no message
This commit is contained in:
13
.idea/workspace.xml
generated
13
.idea/workspace.xml
generated
@@ -7,16 +7,13 @@
|
|||||||
</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/TestingSystem/Common/TestingPackageToKill/TestingPackageToKill.java" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackageToKill/TestingPackagesToKillDBTable.java" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.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/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.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" />
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
"PerformanceAnalyzerPath": "",
|
"PerformanceAnalyzerPath": "",
|
||||||
"ComponentsBackUpsCount": 10,
|
"ComponentsBackUpsCount": 10,
|
||||||
"TestingKernels": 28,
|
"TestingKernels": 28,
|
||||||
"AutoCheckTesting": true,
|
"AutoCheckTesting": false,
|
||||||
"CheckTestingIntervalSeconds": 10,
|
"CheckTestingIntervalSeconds": 10,
|
||||||
"EmailOnTestingProgress": true
|
"EmailOnTestingProgress": false
|
||||||
}
|
}
|
||||||
@@ -6,8 +6,9 @@ public class DVMPackagesBar extends DataMenuBar {
|
|||||||
super("пакеты задач DVM", PassCode_2021.AddDVMPackage,
|
super("пакеты задач DVM", PassCode_2021.AddDVMPackage,
|
||||||
PassCode_2021.AddTasksToDVMPackage,
|
PassCode_2021.AddTasksToDVMPackage,
|
||||||
PassCode_2021.StartDVMPackage,
|
PassCode_2021.StartDVMPackage,
|
||||||
|
PassCode_2021.AbortDVMPackage,
|
||||||
PassCode_2021.DeleteDVMPackage
|
PassCode_2021.DeleteDVMPackage
|
||||||
// PassCode_2021.ExportTasksPackageToExcel,PassCode_2021.AbortTaskPackage, PassCode_2021.DeleteTasksPackage
|
// PassCode_2021.ExportTasksPackageToExcel,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ public class TestingPackage extends riDBObject {
|
|||||||
public String drv = ""; //пусть к исполняемому файлы тестируемого объекта
|
public String drv = ""; //пусть к исполняемому файлы тестируемого объекта
|
||||||
//--
|
//--
|
||||||
public int progress = 0; //прогресс выполнения
|
public int progress = 0; //прогресс выполнения
|
||||||
public long StartDate= 0;
|
public long StartDate = 0;
|
||||||
public long ChangeDate =0;
|
public long ChangeDate = 0;
|
||||||
public TasksPackageState state = TasksPackageState.Draft;
|
public TasksPackageState state = TasksPackageState.Draft;
|
||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
@@ -27,7 +27,15 @@ public class TestingPackage extends riDBObject {
|
|||||||
drv = tasksPackage.drv;
|
drv = tasksPackage.drv;
|
||||||
kernels = tasksPackage.kernels;
|
kernels = tasksPackage.kernels;
|
||||||
progress = tasksPackage.progress;
|
progress = tasksPackage.progress;
|
||||||
|
StartDate = tasksPackage.StartDate;
|
||||||
|
ChangeDate = tasksPackage.ChangeDate;
|
||||||
state = tasksPackage.state;
|
state = tasksPackage.state;
|
||||||
}
|
}
|
||||||
public void destructor(){}
|
public TestingPackage(TestingPackage p) {
|
||||||
|
SynchronizeFields(p);
|
||||||
|
}
|
||||||
|
public TestingPackage() {
|
||||||
|
}
|
||||||
|
public void destructor() {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,6 +91,9 @@ public abstract class TestingPlanner<P extends TestingPackage> {
|
|||||||
protected void Disconnect() {
|
protected void Disconnect() {
|
||||||
}
|
}
|
||||||
//---
|
//---
|
||||||
|
protected void CheckExecutionStates() throws Exception{
|
||||||
|
|
||||||
|
}
|
||||||
//жизненный цикл планировщика
|
//жизненный цикл планировщика
|
||||||
protected void Session() throws Exception {
|
protected void Session() throws Exception {
|
||||||
switch (testingPackage.state) {
|
switch (testingPackage.state) {
|
||||||
@@ -105,6 +108,8 @@ public abstract class TestingPlanner<P extends TestingPackage> {
|
|||||||
case PackageStart:
|
case PackageStart:
|
||||||
PackageStart();
|
PackageStart();
|
||||||
EmailPackage();
|
EmailPackage();
|
||||||
|
testingPackage.StartDate = new Date().getTime();
|
||||||
|
testingPackage.progress = 0;
|
||||||
UpdatePackageState(getStateAfterStart());
|
UpdatePackageState(getStateAfterStart());
|
||||||
break;
|
break;
|
||||||
case CompilationWorkspacesCreation:
|
case CompilationWorkspacesCreation:
|
||||||
|
|||||||
@@ -22,6 +22,11 @@ public class DVMPackage extends TestingPackage {
|
|||||||
//---
|
//---
|
||||||
@Description("IGNORE")
|
@Description("IGNORE")
|
||||||
public DVMPackage_json package_json = null;
|
public DVMPackage_json package_json = null;
|
||||||
|
public DVMPackage(){}
|
||||||
|
public DVMPackage(DVMPackage p) {
|
||||||
|
super(p);
|
||||||
|
this.SynchronizeFields(p);
|
||||||
|
}
|
||||||
//---
|
//---
|
||||||
@Override
|
@Override
|
||||||
public void destructor() {
|
public void destructor() {
|
||||||
|
|||||||
@@ -177,14 +177,14 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
|
|||||||
LinkedHashMap<Integer, File> tests = getTestsFromJson();
|
LinkedHashMap<Integer, File> tests = getTestsFromJson();
|
||||||
//синхронизировать их.
|
//синхронизировать их.
|
||||||
for (int test_id : tests.keySet()) {
|
for (int test_id : tests.keySet()) {
|
||||||
// Print("testId="+test_id);
|
// Print("testId="+test_id);
|
||||||
File test = tests.get(test_id);
|
File test = tests.get(test_id);
|
||||||
RemoteFile test_dst = new RemoteFile(testingPackage.user_workspace + "/projects/" + test_id, true);
|
RemoteFile test_dst = new RemoteFile(testingPackage.user_workspace + "/projects/" + test_id, true);
|
||||||
// Print("src="+test.getAbsolutePath());
|
// Print("src="+test.getAbsolutePath());
|
||||||
// Print("dst="+test_dst.full_name);
|
// Print("dst="+test_dst.full_name);
|
||||||
user.connection.MKDIR(test_dst);
|
user.connection.MKDIR(test_dst);
|
||||||
user.connection.SynchronizeSubDirsR(test, test_dst);
|
user.connection.SynchronizeSubDirsR(test, test_dst);
|
||||||
// Print("done");
|
// Print("done");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
@@ -236,6 +236,22 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean CheckNextState() throws Exception {
|
protected boolean CheckNextState() throws Exception {
|
||||||
|
boolean progress_changed = false;
|
||||||
|
boolean state_changed = false;
|
||||||
|
|
||||||
|
RemoteFile progress = new RemoteFile(packageRemoteWorkspace, "progress");
|
||||||
|
if (user.connection.Exists(progress)) {
|
||||||
|
String s = user.connection.readFromFile(progress).replace("\r", "").replace("\n", "");
|
||||||
|
int current_progress = Integer.parseInt(s);
|
||||||
|
System.out.println("current_progress="+current_progress);
|
||||||
|
System.out.println("old_progress="+testingPackage.progress);
|
||||||
|
/*
|
||||||
|
if (current_progress != testingPackage.progress) {
|
||||||
|
testingPackage.progress = current_progress;
|
||||||
|
progress_changed = true;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
RemoteFile stateDir = new RemoteFile(packageRemoteWorkspace, "state");
|
RemoteFile stateDir = new RemoteFile(packageRemoteWorkspace, "state");
|
||||||
//состояния пакета могут меняться только по возрастанию. ищем, появилось ли такое.
|
//состояния пакета могут меняться только по возрастанию. ищем, появилось ли такое.
|
||||||
Vector<TasksPackageState> higherStates = testingPackage.state.getHigherStates();
|
Vector<TasksPackageState> higherStates = testingPackage.state.getHigherStates();
|
||||||
@@ -245,10 +261,11 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
|
|||||||
if (user.connection.Exists(file)) {
|
if (user.connection.Exists(file)) {
|
||||||
Print("found new state: " + file.name);
|
Print("found new state: " + file.name);
|
||||||
testingPackage.state = state;
|
testingPackage.state = state;
|
||||||
return true;
|
state_changed = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return progress_changed || state_changed;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void DownloadResults() throws Exception {
|
protected void DownloadResults() throws Exception {
|
||||||
@@ -330,9 +347,9 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
testingPackage.progress = 100;
|
||||||
testingPackage.saveJson(); //запись обновленных результатов пакета в json!
|
testingPackage.saveJson(); //запись обновленных результатов пакета в json!
|
||||||
Print("analysis done, ct_count=" + ct_count + " rt count=" + rt_count);
|
Print("analysis done, ct_count=" + ct_count + " rt count=" + rt_count);
|
||||||
//--
|
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void Kill() throws Exception {
|
protected void Kill() throws Exception {
|
||||||
@@ -354,7 +371,7 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
|
|||||||
packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true);
|
packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true);
|
||||||
packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id));
|
packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id));
|
||||||
//-
|
//-
|
||||||
Print("packageremoteWorkspace="+Utils.Brackets(packageRemoteWorkspace.full_name));
|
Print("packageremoteWorkspace=" + Utils.Brackets(packageRemoteWorkspace.full_name));
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean Connect() {
|
protected boolean Connect() {
|
||||||
|
|||||||
Reference in New Issue
Block a user