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

fix

Browse Source
This commit is contained in:
02090095
2023-12-14 19:57:47 +03:00
parent 1fc60e6c12
commit ff3e3003d4
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -8,15 +8,8 @@
<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 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$/src/ProjectData/Files/ProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

2
src/TestingSystem/Common/TestingPlanner.java
View File

@@ -104,8 +104,8 @@ public abstract class TestingPlanner<P extends TestingPackage> {
break; break;
case PackageStart: case PackageStart:
PackageStart(); PackageStart();
UpdatePackageState(getStateAfterStart());
EmailPackage(); EmailPackage();
UpdatePackageState(getStateAfterStart());
break; break;
case CompilationWorkspacesCreation: case CompilationWorkspacesCreation:
case CompilationPreparation: case CompilationPreparation:

2
src/TestingSystem/Common/TestingServer.java
View File

@@ -102,7 +102,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//--->> //--->>
@Override @Override
protected void startAdditionalThreads() { protected void startAdditionalThreads() {
testingThread.start(); // testingThread.start();
testingThread_2023.start(); testingThread_2023.start();
} }
protected TestingPlanner_OLD testingPlannerOLD = new TestingPlanner_OLD(); protected TestingPlanner_OLD testingPlannerOLD = new TestingPlanner_OLD();

6
src/TestingSystem/DVM/DVMTestingPlanner.java
View File

@@ -124,8 +124,9 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
Vector<String> bodies = new Vector<>(); Vector<String> bodies = new Vector<>();
String binary = Utils.DQuotes("0"); String binary = Utils.DQuotes("0");
//----->> //----->>
for (LanguageName languageName : programs.keySet()) for (LanguageName languageName : programs.keySet()) {
generateForLanguage(dvm_drv, languageName, programs.get(test_language), titles, objects, bodies, flags); generateForLanguage(dvm_drv, languageName, programs.get(languageName), titles, objects, bodies, flags);
}
//----->> //----->>
return String.join("\n", return String.join("\n",
"LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " + "LINK_COMMAND=" + Utils.DQuotes(dvm_drv) + " " +
@@ -239,6 +240,7 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
RemoteFile file = new RemoteFile(stateDir, state.toString()); RemoteFile file = new RemoteFile(stateDir, state.toString());
if (user.connection.Exists(file)) { if (user.connection.Exists(file)) {
Print("found new state: " + file.name); Print("found new state: " + file.name);
testingPackage.state = state;
return true; return true;
} }
} }