no message
This commit is contained in:
@@ -79,25 +79,25 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
DVMCompilationPackage_json compilationPackage_json = new DVMCompilationPackage_json();
|
||||
DVMRunPackage_json runPackage_json = new DVMRunPackage_json();
|
||||
//положить туда запакованные тексты задач.
|
||||
Vector<String> compilationLines_OLD = new Vector<>(); //старые. выкинуть.
|
||||
Vector<String> runLines_OLD = 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_OLD.addAll(compilationTask.pack(makefileText)); //old
|
||||
// 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
|
||||
// runLines_OLD.addAll(runTask.pack(null)); //оld
|
||||
//--
|
||||
runPackage_json.tasks.add(new RunTask_json(runTask));
|
||||
}
|
||||
}
|
||||
//упразднить
|
||||
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_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");
|
||||
|
||||
Reference in New Issue
Block a user