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

удаление отладочной печати сравнения и не только

Browse Source
This commit is contained in:
02090095
2024-07-22 00:57:05 +03:00
parent 3374c9783b
commit 53ad5e637f
76 changed files with 78 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
View File

@@ -98,16 +98,13 @@ public class SapforVersion_json implements Serializable {
}
public boolean isMatch(SapforVersion_json version_json) {
if (!description.equals(version_json.description)) {
System.out.println("не совпадение описания версии");
return false;
}
if (files.size() != version_json.files.size()) {
System.out.println("не совпадение количества файлов");
return false;
}
for (String name1 : files.keySet()) {
if (!version_json.files.containsKey(name1)) {
System.out.println("Файл " + Utils.Brackets(name1) + " не найден в версии " + version_json.Home);
return false;
}
}
@@ -128,7 +125,6 @@ public class SapforVersion_json implements Serializable {
ex.printStackTrace();
}
if (!Utils.compareFortranTexts(text1, text2)) {
System.out.println("различие текста файла " + Utils.Brackets(file1.file.getName()));
return false;
}
}
@@ -140,14 +136,11 @@ public class SapforVersion_json implements Serializable {
res.line = Constants.Nan;
res.value = "";
String line = line_in.substring(9);
//System.out.println(line);
int i = 0;
int s = 0;
String lexeme = "";
//#1020: red43.fdv: line 988]: Active DVM directives are not supported (turn on DVM-directive support option)
for (char c : line.toCharArray()) {
// System.out.print("<s=" + s + ">");
// System.out.println(c);
switch (s) {
case 0:
//поиск groups_s

3
src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
View File

@@ -132,7 +132,6 @@ public class SapforTask extends DBObject {
LinkedHashMap<String, SapforVersion_json> versions2 = task2.getSortedVersions();
//---
for (String name1 : versions1.keySet()) {
System.out.println("current version="+Utils.Brackets(name1));
if (versions2.containsKey(name1)) {
SapforVersion_json version1 = versions1.get(name1);
SapforVersion_json version2 = versions2.get(name1);
@@ -143,12 +142,10 @@ public class SapforTask extends DBObject {
version1.comparisonState = VersionComparisonState.NotMatch;
version2.comparisonState = VersionComparisonState.NotMatch;
//-
// System.out.println(version1.comparisonState);
}else {
version1.comparisonState = VersionComparisonState.Match;
version2.comparisonState = VersionComparisonState.Match;
//-
// System.out.println(version1.comparisonState);
}
} else {
comparisonState = ComparisonState.NotMatch;

7
src/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -184,15 +184,11 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
}
}
void SyncronizeRepository() throws Exception {
System.out.println("Синхронизация репозитория...");
UpdateSapforState(ServerSapforState.DVMRepositorySynchronization);
System.out.println("Синхронизация ветви DVM...");
Utils.startScript(repo, repo, "dvm_checkout",
"svn checkout " +
Constants.REPOSITORY_AUTHENTICATION +
" " + Constants.DVM_REPOSITORY + " 1>dvm_out.txt 2>dvm_err.txt\n").waitFor();
System.out.println("Синхронизация ветви SAPFOR...");
UpdateSapforState(ServerSapforState.SAPFORRepositorySynchronization);
Utils.startScript(repo, repo, "spf_checkout",
"svn checkout " +
@@ -200,7 +196,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
" " + Constants.SAPFOR_REPOSITORY + " 1>spf_out.txt 2>spf_err.txt\n").waitFor();
}
void CompileSapfor() throws Exception {
System.out.println("Сборка SAPFOR...");
UpdateSapforState(ServerSapforState.Compilation);
//-
if (repo_bin.exists())
@@ -234,7 +229,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
max_version = (int) ServerCommand(ServerCode.GetMaxSapforVersion);
current_version = Sapfor.readVersionFromCode(Paths.get(repo.getAbsolutePath(), "/sapfor/experts/Sapfor_2017/_src/Utils/version.h").toFile());
if (current_version==max_version){
System.out.println("Версия SAPFOR " + max_version + " уже собрана!");
ServerCommand(ServerCode.DeleteObjectByPK, new Pair(ServerSapfor.class,sapfor.id));
return;
}
@@ -256,7 +250,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
if (repo_err.exists())
FileUtils.copyFile(repo_err, sapforErr);
if (repo_bin.exists()) {
System.out.println("Сборка SAPFOR успешно выполнена");
FileUtils.copyFile(repo_bin, sapforBin);
sapforBin.setExecutable(true, false);
//--