add return code from test

Signed-off-by: issacto <[email protected]>
openmainframeproject · Jun 27, 2023 · f5259ac · f5259ac
1 parent 0b17618
commit f5259ac
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/org/openmainframeproject/cobolcheck/Main.java b/src/main/java/org/openmainframeproject/cobolcheck/Main.java
@@ -22,6 +22,8 @@ public static void main(String[] args) throws InterruptedException {
 
             if (initializer.launchTestProgram())
                 testRunner.run(programName, initializer.isLastSourceProgram(programName));
+                initializer.setReturnCode(testRunner.getReturnCode());
+
         }
 
         initializer.exitProgram();

diff --git a/src/main/java/org/openmainframeproject/cobolcheck/features/Status/CurrentStatus.java b/src/main/java/org/openmainframeproject/cobolcheck/features/Status/CurrentStatus.java
@@ -5,7 +5,7 @@
 public class CurrentStatus {
 
     public CurrentStatus(){
-        exitStatus = Constants.STATUS_NORMAL;
+        exitStatus = Constants.STATUS_TEST_ERROR;
     }
 
     int exitStatus;

diff --git a/src/main/java/org/openmainframeproject/cobolcheck/features/launcher/LauncherController.java b/src/main/java/org/openmainframeproject/cobolcheck/features/launcher/LauncherController.java
@@ -12,6 +12,7 @@
 public class LauncherController {
     private Launcher launcher;
     private ProcessOutputWriter processOutputWriter;
+    private int returnCode;
 
     public LauncherController(){
         if (Config.getRunGeneratedTest()){
@@ -44,6 +45,11 @@ public void runTestProgram(String programName, boolean isLastRun) throws Interru
         if (processOutputWriter.writeWasSuccesful){
             Log.info(Messages.get("INF011", processName, processOutputWriter.getTestResultsFilePath()));
         }
+        this.returnCode = exitCode;
         Log.info(Messages.get("INF009", processName, String.valueOf(exitCode)));
     }
+
+    public int getReturnCode(){
+        return this.returnCode;
+    }
 }
diff --git a/src/main/java/org/openmainframeproject/cobolcheck/services/Constants.java b/src/main/java/org/openmainframeproject/cobolcheck/services/Constants.java
@@ -14,6 +14,7 @@ private Constants() {
 
     // File read status values
     public static final int STATUS_NORMAL = 0;
+    public static final int STATUS_TEST_ERROR = 4;
     public static final int STATUS_HALT = 8;
 
     public static final int COMMENT_SPACE_OFFSET = 7;

diff --git a/src/main/java/org/openmainframeproject/cobolcheck/workers/CobolTestRunner.java b/src/main/java/org/openmainframeproject/cobolcheck/workers/CobolTestRunner.java
@@ -19,4 +19,8 @@ public void run(String programName, boolean isLastRun) throws InterruptedExcepti
         programName = path.getFileName().toString();
         controller.runTestProgram(programName, isLastRun);
     }
+
+    public int getReturnCode(){
+        return controller.getReturnCode();
+    }
 }
diff --git a/src/main/java/org/openmainframeproject/cobolcheck/workers/Initializer.java b/src/main/java/org/openmainframeproject/cobolcheck/workers/Initializer.java
@@ -48,6 +48,10 @@ public void run() {
         statusController.setTestFileNames(argumentController.getKeyValue(Constants.TESTS_OPTION));
     }
 
+    public void setReturnCode(int returnCode){
+        if(returnCode==0) statusController.setExitStatusNormal();
+    }
+
     public String[] getSourceProgramNames(){
         return statusController.getSourceProgramNames();
     }