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

исправление бага с определением версии с++ на целевой машине тестирования DVM

Browse Source
This commit is contained in:
02090095
2024-03-24 23:36:56 +03:00
parent 3f49abc35a
commit bd5ebdf53c
5 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -7,12 +7,11 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertImplicitNone.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

4
properties
View File

@@ -10,7 +10,7 @@
"SMTPHost": "smtp.mail.ru", "SMTPHost": "smtp.mail.ru",
"SMTPPort": 465, "SMTPPort": 465,
"MailSocketPort": 465, "MailSocketPort": 465,
"collapseCredentials": true, "collapseCredentials": false,
"collapseFileGraphs": true, "collapseFileGraphs": true,
"collapseFileMessages": true, "collapseFileMessages": true,
"collapseProjectTrees": true, "collapseProjectTrees": true,
@@ -35,7 +35,7 @@
"PerformanceAnalyzerPath": "", "PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10, "ComponentsBackUpsCount": 10,
"TestingKernels": 16, "TestingKernels": 16,
"AutoCheckTesting": false, "AutoCheckTesting": true,
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": false, "EmailOnTestingProgress": false,
"eraseTestingWorkspaces": true "eraseTestingWorkspaces": true

2
src/Common/Constants.java
View File

@@ -7,7 +7,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class Constants { public class Constants {
public static final int Nan = -1; public static final int Nan = -1;
public static final int planner_version = 2; public static final int planner_version = 3;
//-- //--
public static final String testingSystemHomeName = "_testing_system"; public static final String testingSystemHomeName = "_testing_system";
//SVN //SVN

27
src/TestingSystem/DVM/UserConnection.java
View File

@@ -268,17 +268,30 @@ public class UserConnection {
Pair<RemoteFile, RemoteFile> oe = performScript(scriptDirectory, command); Pair<RemoteFile, RemoteFile> oe = performScript(scriptDirectory, command);
RemoteFile outFile = oe.getKey(); RemoteFile outFile = oe.getKey();
String out = readFromFile(outFile); String out = readFromFile(outFile);
//--
RemoteFile cppVersionsInfo = new RemoteFile(scriptDirectory, "cpp_versions.txt");
sftpChannel.rename(outFile.full_name, cppVersionsInfo.full_name);
//--
String[] data = out.split("\n"); String[] data = out.split("\n");
boolean cpp_17=false;
boolean cpp_11=false;
//определить какие есть версии.
for (String version : data) { for (String version : data) {
System.out.println(Utils.Brackets(version)); switch (version){
if (version.equals("c++17")) { case "c++17":
cpp_17=true;
break;
case "c++11":
cpp_11=true;
break;
}
}
if (cpp_17)
res = "-std=c++17"; res = "-std=c++17";
break; else if (cpp_11)
} else if (version.equals("c++11")) {
res= "-std=c++11"; res= "-std=c++11";
break; RemoteFile cppFlag = new RemoteFile(scriptDirectory, "current_ccp_version");
} writeToFile(res, cppFlag);
}
return res; return res;
} }
public String compileModules(RemoteFile modulesDirectory) throws Exception { public String compileModules(RemoteFile modulesDirectory) throws Exception {

2
src/files/version.h
View File

@@ -1 +1 @@
2 3