исправление бага с определением версии с++ на целевой машине тестирования DVM
This commit is contained in:
7
.idea/workspace.xml
generated
7
.idea/workspace.xml
generated
@@ -7,12 +7,11 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<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$/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/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.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/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.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/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
"SMTPHost": "smtp.mail.ru",
|
||||
"SMTPPort": 465,
|
||||
"MailSocketPort": 465,
|
||||
"collapseCredentials": true,
|
||||
"collapseCredentials": false,
|
||||
"collapseFileGraphs": true,
|
||||
"collapseFileMessages": true,
|
||||
"collapseProjectTrees": true,
|
||||
@@ -35,7 +35,7 @@
|
||||
"PerformanceAnalyzerPath": "",
|
||||
"ComponentsBackUpsCount": 10,
|
||||
"TestingKernels": 16,
|
||||
"AutoCheckTesting": false,
|
||||
"AutoCheckTesting": true,
|
||||
"CheckTestingIntervalSeconds": 10,
|
||||
"EmailOnTestingProgress": false,
|
||||
"eraseTestingWorkspaces": true
|
||||
|
||||
@@ -7,7 +7,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
|
||||
import java.util.regex.Pattern;
|
||||
public class Constants {
|
||||
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";
|
||||
//SVN
|
||||
|
||||
@@ -268,17 +268,30 @@ public class UserConnection {
|
||||
Pair<RemoteFile, RemoteFile> oe = performScript(scriptDirectory, command);
|
||||
RemoteFile outFile = oe.getKey();
|
||||
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");
|
||||
boolean cpp_17=false;
|
||||
boolean cpp_11=false;
|
||||
//определить какие есть версии.
|
||||
for (String version : data) {
|
||||
System.out.println(Utils.Brackets(version));
|
||||
if (version.equals("c++17")) {
|
||||
switch (version){
|
||||
case "c++17":
|
||||
cpp_17=true;
|
||||
break;
|
||||
case "c++11":
|
||||
cpp_11=true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (cpp_17)
|
||||
res = "-std=c++17";
|
||||
break;
|
||||
} else if (version.equals("c++11")) {
|
||||
res = "-std=c++11";
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (cpp_11)
|
||||
res= "-std=c++11";
|
||||
RemoteFile cppFlag = new RemoteFile(scriptDirectory, "current_ccp_version");
|
||||
writeToFile(res, cppFlag);
|
||||
return res;
|
||||
}
|
||||
public String compileModules(RemoteFile modulesDirectory) throws Exception {
|
||||
|
||||
@@ -1 +1 @@
|
||||
2
|
||||
3
|
||||
Reference in New Issue
Block a user