no message
This commit is contained in:
@@ -29,12 +29,14 @@ public class PackageModeSupervisor extends ThreadsPlanner {
|
||||
for (String testName : package_json.tests) {
|
||||
//--- чтобы было можно на нее сослаться после выполнения всех нитей.
|
||||
SapforTask task = new SapforTask();
|
||||
task.test_description = testName;
|
||||
task.flags = sapforConfiguration_json.flags;
|
||||
task.sapfor_configuration_id = sapforConfiguration_json.id;
|
||||
results_json.tasks.add(task);
|
||||
//---
|
||||
addThread(() -> new PerformSapforTask().Do(
|
||||
sapfor_drv,
|
||||
sapforConfiguration_json,
|
||||
testName,
|
||||
task
|
||||
));
|
||||
}
|
||||
|
||||
@@ -50,14 +50,11 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
|
||||
protected boolean canStart(Object... args) throws Exception {
|
||||
sapfor_drv = (File) args[0];
|
||||
sapforConfiguration_json = (SapforConfiguration_json) args[1];
|
||||
String testDescription = (String) args[2];
|
||||
target = (SapforTask) args[3];
|
||||
target = (SapforTask) args[2];
|
||||
//--->>
|
||||
parentTask = Paths.get(Global.Home, sapforConfiguration_json.id, testDescription).toFile();
|
||||
parentTask = Paths.get(Global.Home, sapforConfiguration_json.id, target.test_description).toFile();
|
||||
task = null;
|
||||
//--->>
|
||||
target.sapfor_configuration_id = sapforConfiguration_json.id;
|
||||
target.test_description = testDescription;
|
||||
target.root = parentTask.getAbsolutePath();
|
||||
return true;
|
||||
}
|
||||
@@ -92,7 +89,7 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
|
||||
File file = new File(data_workspace, name + (Global.isWindows ? ".bat" : ".sh"));
|
||||
FileUtils.write(file,
|
||||
Utils.DQuotes(sapfor_drv.getAbsolutePath())
|
||||
+ (sapforConfiguration_json.flags.isEmpty() ? "" : (" " + sapforConfiguration_json.flags))
|
||||
+ (target.flags.isEmpty() ? "" : (" " + target.flags))
|
||||
+ " -noLogo"
|
||||
+ " " + command +
|
||||
" 1>" +
|
||||
|
||||
@@ -21,6 +21,9 @@ public class SapforTask extends DBObject {
|
||||
public String test_description = "";
|
||||
@Description("DEFAULT ''")
|
||||
@Expose
|
||||
public String flags = "";
|
||||
@Description("DEFAULT ''")
|
||||
@Expose
|
||||
public String root = "";
|
||||
@Description("DEFAULT ''")
|
||||
@Expose
|
||||
|
||||
Reference in New Issue
Block a user