From 9cfb8eff0ee7b749ce10789e25e5c4f3ec9ea40a Mon Sep 17 00:00:00 2001
From: Aman Goel <goelaman@amazon.com>
Date: Thu, 5 Sep 2024 20:57:43 +0000
Subject: [PATCH] [PEx] Correct return codes, [Tst] Limit choose choices

---
 Src/PRuntimes/PExRuntime/src/main/java/pex/PEx.java    | 10 +++++-----
 .../src/main/java/pex/runtime/logger/PExLogger.java    |  2 +-
 .../PExRuntime/src/test/java/pex/TestCaseExecutor.java |  4 +---
 .../Feature3Exprs/DynamicError/ModExpr1/modexpr1.p     |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Src/PRuntimes/PExRuntime/src/main/java/pex/PEx.java b/Src/PRuntimes/PExRuntime/src/main/java/pex/PEx.java
index c8c1d0b78b..265de3db21 100644
--- a/Src/PRuntimes/PExRuntime/src/main/java/pex/PEx.java
+++ b/Src/PRuntimes/PExRuntime/src/main/java/pex/PEx.java
@@ -69,20 +69,20 @@ public static void main(String[] args) {
             // run the analysis
             RuntimeExecutor.run();
         } catch (TooManyChoicesException e) {
-            exit_code = 3;
+            exit_code = 2;
         } catch (BugFoundException e) {
             exit_code = 2;
         } catch (InvocationTargetException ex) {
             ex.printStackTrace();
-            exit_code = 6;
+            exit_code = 5;
         } catch (Exception ex) {
             if (ex.getMessage().equals("TIMEOUT")) {
-                exit_code = 4;
+                exit_code = 3;
             } else if (ex.getMessage().equals("MEMOUT")) {
-                exit_code = 5;
+                exit_code = 4;
             } else {
                 ex.printStackTrace();
-                exit_code = 6;
+                exit_code = 5;
             }
         } finally {
             // log end-of-run metrics
diff --git a/Src/PRuntimes/PExRuntime/src/main/java/pex/runtime/logger/PExLogger.java b/Src/PRuntimes/PExRuntime/src/main/java/pex/runtime/logger/PExLogger.java
index c5d836831b..fcaae1813f 100644
--- a/Src/PRuntimes/PExRuntime/src/main/java/pex/runtime/logger/PExLogger.java
+++ b/Src/PRuntimes/PExRuntime/src/main/java/pex/runtime/logger/PExLogger.java
@@ -88,7 +88,7 @@ public static void logEndOfRun(long timeSpent) {
                     PExGlobal.getMinSteps(), (PExGlobal.getTotalSteps() / PExGlobal.getTotalSchedules()), PExGlobal.getMaxSteps()));
         }
         log.info(String.format("... Elapsed %d seconds and used %.1f GB", timeSpent, MemoryMonitor.getMaxMemSpent() / 1000.0));
-        log.info(String.format(".. Result: " + PExGlobal.getResult()));
+        log.info(String.format(".. \033[0;30;47m Result: %s \033[m", PExGlobal.getResult()));
         log.info(". Done");
     }
 
diff --git a/Src/PRuntimes/PExRuntime/src/test/java/pex/TestCaseExecutor.java b/Src/PRuntimes/PExRuntime/src/test/java/pex/TestCaseExecutor.java
index 40e060e3a6..55a1687eea 100644
--- a/Src/PRuntimes/PExRuntime/src/test/java/pex/TestCaseExecutor.java
+++ b/Src/PRuntimes/PExRuntime/src/test/java/pex/TestCaseExecutor.java
@@ -114,11 +114,9 @@ static int runTestCase(
             } else if (resultCode == 2) {
                 PExTestLogger.log("      bug");
             } else if (resultCode == 3) {
-                PExTestLogger.log("      too_many_choices");
-            } else if (resultCode == 4) {
                 PExTestLogger.log("      timeout");
                 resultCode = 0;
-            } else if (resultCode == 5) {
+            } else if (resultCode == 4) {
                 PExTestLogger.log("      memout");
             } else {
                 PExTestLogger.log("      error");
diff --git a/Tst/RegressionTests/Feature3Exprs/DynamicError/ModExpr1/modexpr1.p b/Tst/RegressionTests/Feature3Exprs/DynamicError/ModExpr1/modexpr1.p
index 69a07b4344..746042b611 100644
--- a/Tst/RegressionTests/Feature3Exprs/DynamicError/ModExpr1/modexpr1.p
+++ b/Tst/RegressionTests/Feature3Exprs/DynamicError/ModExpr1/modexpr1.p
@@ -4,7 +4,7 @@ machine Main {
 			var x, y : int;
 			var z, w : float;
 			var ys: set[int];
-			x = choose(100);
+			x = choose(10);
 			ys += (113);
 			ys += (123);
 			ys += (113);