++
перевод тестов на гит, рефакторинг проходов загрузки репозитория
This commit is contained in:
@@ -4,6 +4,7 @@ import Common.Utils.TextLog;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
|
||||
import _VisualDVM.*;
|
||||
import _VisualDVM.Passes.All.DownloadSapforRepository;
|
||||
import _VisualDVM.ProjectData.LanguageName;
|
||||
import _VisualDVM.Repository.EmailMessage;
|
||||
import _VisualDVM.Repository.Server.ServerCode;
|
||||
@@ -233,14 +234,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
sapfor.state = state_in;
|
||||
ServerCommand(ServerCode.EditObject, sapfor);
|
||||
}
|
||||
void SyncronizeRepository() throws Exception {
|
||||
UpdateSapforState(ServerSapforState.SAPFORRepositorySynchronization);
|
||||
Utils.CleanDirectory(repo);
|
||||
Utils.startScript(repo, repo, "git_clone",
|
||||
"git clone " + Constants.SAPFOR_REPOSITORY + " " + Utils_.DQuotes(repo_sapfor) + " 1>spf_out.txt 2>spf_err.txt\n" +
|
||||
"cd " + Utils_.DQuotes(repo_sapfor) + "\n"+
|
||||
"GIT_SSL_NO_VERIFY=true git submodule update --init\n").waitFor();
|
||||
}
|
||||
void CompileSapfor() throws Exception {
|
||||
UpdateSapforState(ServerSapforState.Compilation);
|
||||
//-
|
||||
@@ -263,7 +256,10 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
max_version = CommonConstants.Nan;
|
||||
current_version = CommonConstants.Nan;
|
||||
//--
|
||||
SyncronizeRepository();
|
||||
UpdateSapforState(ServerSapforState.SAPFORRepositorySynchronization);
|
||||
DownloadSapforRepository pass = new DownloadSapforRepository();
|
||||
pass.Do();
|
||||
//-
|
||||
max_version = (int) ServerCommand(ServerCode.GetMaxSapforVersion);
|
||||
current_version = Sapfor.readVersionFromCode(Paths.get(repo.getAbsolutePath(),
|
||||
"/SAPFOR/src/Utils/version.h").toFile());
|
||||
|
||||
Reference in New Issue
Block a user