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

no message

Browse Source
This commit is contained in:
02090095
2024-10-07 14:22:52 +03:00
parent 6b1576461d
commit 61fc37b574
173 changed files with 960 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
View File

@@ -1,5 +1,5 @@
package TestingSystem.DVM.DVMTasks;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
@@ -36,9 +36,9 @@ public class DVMCompilationTask extends DVMTask {
public static String checkEnvironments(String environmentsSet_in) {
if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
if (environmentsSet_in.isEmpty())
return "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
return "DVMH_NO_DIRECT_COPY=" + CommonUtils.DQuotes("1");
else
return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + CommonUtils.DQuotes("1");
} else
return environmentsSet_in;
}

3
src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -1,4 +1,5 @@
package TestingSystem.DVM.DVMTasks;
import Common.CommonConstants;
import Common_old.Constants;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
@@ -16,7 +17,7 @@ import java.nio.file.Paths;
import java.util.Vector;
public class DVMRunTask extends DVMTask {
@Expose
public int dvmcompilationtask_id = Constants.Nan;
public int dvmcompilationtask_id = CommonConstants.Nan;
@Expose
public String matrix = "";
@Expose

9
src/TestingSystem/DVM/DVMTasks/DVMTask.java
View File

@@ -1,4 +1,5 @@
package TestingSystem.DVM.DVMTasks;
import Common.CommonConstants;
import Common_old.Constants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.iDBObject;
@@ -17,13 +18,13 @@ import java.nio.file.Paths;
import java.util.Vector;
public class DVMTask extends iDBObject {
@Expose
public int dvm_package_id = Constants.Nan;
public int dvm_package_id = CommonConstants.Nan;
@Expose
public int group_id = Constants.Nan;
public int group_id = CommonConstants.Nan;
@Expose
public String group_description = "";
@Expose
public int test_id = Constants.Nan;
public int test_id = CommonConstants.Nan;
@Expose
public String test_description = "";
@Expose
@@ -85,7 +86,7 @@ public class DVMTask extends iDBObject {
}
public String getResultFile(File resultFile) {
String res = "";
if (dvm_package_id == Constants.Nan) res = "задача ещё не выполнялась";
if (dvm_package_id == CommonConstants.Nan) res = "задача ещё не выполнялась";
else {
if (resultFile.exists()) {
try {