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

no message

Browse Source
This commit is contained in:
02090095
2026-02-24 14:58:22 +03:00
parent b705b888f8
commit a70c93e66d
11 changed files with 121 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

@@ -7,6 +7,10 @@ import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.TestingSystem.DVM.json.DVMCompilationPackage_json;
import _VisualDVM.TestingSystem.DVM.json.CompilationTask_json;
import _VisualDVM.TestingSystem.DVM.json.DVMRunPackage_json;
import _VisualDVM.TestingSystem.DVM.json.RunTask_json;
import java.io.File;
import java.util.Collections;
@@ -71,19 +75,35 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
//создать папку для пакета.
user.connection.RMDIR(packageRemoteWorkspace.full_name);
user.connection.sftpChannel.mkdir(packageRemoteWorkspace.full_name);
//--
DVMCompilationPackage_json compilationPackage_json = new DVMCompilationPackage_json();
DVMRunPackage_json runPackage_json = new DVMRunPackage_json();
//положить туда запакованные тексты задач.
Vector<String> compilationLines = new Vector<>();
Vector<String> runLines = new Vector<>();
Vector<String> compilationLines_OLD = new Vector<>(); //старые. выкинуть.
Vector<String> runLines_OLD = new Vector<>(); //старые, выкинуть.
for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
String makefileText = generateMakefile(tests.get(compilationTask.test_id), compilationTask.language, testingPackage.drv, compilationTask.flags);
compilationLines.addAll(compilationTask.pack(makefileText));
for (DVMRunTask runTask : compilationTask.runTasks)
runLines.addAll(runTask.pack(null));
compilationLines_OLD.addAll(compilationTask.pack(makefileText)); //old
//--
compilationPackage_json.tasks.add(new CompilationTask_json(compilationTask, makefileText));
//--
for (DVMRunTask runTask : compilationTask.runTasks) {
runLines_OLD.addAll(runTask.pack(null)); //оld
//--
runPackage_json.tasks.add(new RunTask_json(runTask));
}
}
RemoteFile compilationPackage = new RemoteFile(packageRemoteWorkspace, "compilationTasks");
RemoteFile runPackage = new RemoteFile(packageRemoteWorkspace, "runTasks");
user.connection.writeToFile(String.join("\n", compilationLines) + "\n", compilationPackage);
user.connection.writeToFile(String.join("\n", runLines) + "\n", runPackage);
//упразднить
RemoteFile compilationFile_old = new RemoteFile(packageRemoteWorkspace, "compilationTasks");
RemoteFile runPackage_old = new RemoteFile(packageRemoteWorkspace, "runTasks");
user.connection.writeToFile(String.join("\n", compilationLines_OLD) + "\n", compilationFile_old);
user.connection.writeToFile(String.join("\n", runLines_OLD) + "\n", runPackage_old);
//--
RemoteFile compilationFile_json = new RemoteFile(packageRemoteWorkspace, "compilationTasks.json");
RemoteFile runFile_json = new RemoteFile(packageRemoteWorkspace, "runTasks.json");
//--
user.connection.writeToFile(Utils_.gson.toJson(compilationPackage_json),compilationFile_json);
user.connection.writeToFile(Utils_.gson.toJson(runPackage_json), runFile_json);
// --
user.connection.MKDIR(new RemoteFile(packageRemoteWorkspace, "state"));
}