no message
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package _VisualDVM.TestingSystem.SAPFOR;
|
||||
import Common.CommonConstants;
|
||||
import Common.Mode;
|
||||
import Common.Utils.CommonUtils;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.Constants;
|
||||
import _VisualDVM.GlobalProperties;
|
||||
import _VisualDVM.Utils;
|
||||
@@ -40,8 +40,8 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
File repo_err;
|
||||
//--
|
||||
public SapforTestingPlanner() {
|
||||
repo = new File(CommonUtils.getHomeDirectory(), "Repo");
|
||||
repoSapforHome = Paths.get(CommonUtils.getHomePath(), "Repo", Constants.SAPFOR_REPOSITORY_BIN).toFile();
|
||||
repo = new File(Utils_.getHomeDirectory(), "Repo");
|
||||
repoSapforHome = Paths.get(Utils_.getHomePath(), "Repo", Constants.SAPFOR_REPOSITORY_BIN).toFile();
|
||||
repo_bin = new File(repoSapforHome, "Sapfor_F");
|
||||
repo_out = new File(repoSapforHome, Constants.out_file);
|
||||
repo_err = new File(repoSapforHome, Constants.err_file);
|
||||
@@ -91,11 +91,11 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
protected void PackageWorkspaceCreation() throws Exception {
|
||||
//копирование визуализатора
|
||||
File visualiser = new File(workspace, "VisualSapfor.jar");
|
||||
FileUtils.copyFile(new File(CommonUtils.getHomeDirectory(), "TestingSystem.jar"), visualiser);
|
||||
FileUtils.copyFile(new File(Utils_.getHomeDirectory(), "TestingSystem.jar"), visualiser);
|
||||
//создание настроек
|
||||
GlobalProperties properties = new GlobalProperties(Global.properties);
|
||||
properties.Mode = Mode.Package;
|
||||
CommonUtils.jsonToFile(properties, new File(workspace, "properties"));
|
||||
Utils_.jsonToFile(properties, new File(workspace, "properties"));
|
||||
//подготовка пакетного режима. Запустит его уже очередь.
|
||||
Utils.createScript(workspace, workspace, "start", "java -jar VisualSapfor.jar");
|
||||
}
|
||||
@@ -109,7 +109,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
File started = new File(workspace, Constants.STARTED);
|
||||
while (!started.exists()) {
|
||||
Print("waiting for package start...");
|
||||
CommonUtils.sleep(1000);
|
||||
Utils_.sleep(1000);
|
||||
}
|
||||
File pid = new File(workspace, "PID");
|
||||
testingPackage.PID = FileUtils.readFileToString(pid, Charset.defaultCharset());
|
||||
@@ -237,7 +237,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
return;
|
||||
}
|
||||
//-
|
||||
File sapforHome = new File(Global.SapforsDirectory, CommonUtils.getDateName("sapfor"));
|
||||
File sapforHome = new File(Global.SapforsDirectory, Utils_.getDateName("sapfor"));
|
||||
//--
|
||||
sapfor.home_path = sapforHome.getAbsolutePath();
|
||||
sapfor.languageName = LanguageName.fortran;
|
||||
|
||||
Reference in New Issue
Block a user