Add non-zero exit code for exceptions in CLI tools, fixes #88

ftsrg · Sep 28, 2020 · 03b741c · 03b741c
1 parent c10037d
commit 03b741c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
 
 allprojects {
     group = "hu.bme.mit.inf.theta"
-    version = "2.5.1"
+    version = "2.6.0"
 
     apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts"))
 }

diff --git a/subprojects/cfa-cli/src/main/java/hu/bme/mit/theta/cfa/cli/CfaCli.java b/subprojects/cfa-cli/src/main/java/hu/bme/mit/theta/cfa/cli/CfaCli.java
@@ -191,9 +191,7 @@ private void run() {
 			}
 		} catch (final Throwable ex) {
 			printError(ex);
-		}
-		if (benchmarkMode) {
-			writer.newRow();
+			System.exit(1);
 		}
 	}
 
@@ -248,13 +246,15 @@ private void printResult(final SafetyResult<?, ?> status, final long totalTimeMs
 			} else {
 				writer.cell("");
 			}
+			writer.newRow();
 		}
 	}
 
 	private void printError(final Throwable ex) {
 		final String message = ex.getMessage() == null ? "" : ex.getMessage();
 		if (benchmarkMode) {
 			writer.cell("[EX] " + ex.getClass().getSimpleName() + ": " + message);
+			writer.newRow();
 		} else {
 			logger.write(Level.RESULT, "%s occurred, message: %s%n", ex.getClass().getSimpleName(), message);
 			if (stacktrace) {

diff --git a/subprojects/sts-cli/src/main/java/hu/bme/mit/theta/sts/cli/StsCli.java b/subprojects/sts-cli/src/main/java/hu/bme/mit/theta/sts/cli/StsCli.java
@@ -153,9 +153,7 @@ private void run() {
 			}
 		} catch (final Throwable ex) {
 			printError(ex);
-		}
-		if (benchmarkMode) {
-			writer.newRow();
+			System.exit(1);
 		}
 	}
 
@@ -221,13 +219,15 @@ private void printResult(final SafetyResult<?, ?> status, final STS sts, final l
 			}
 			writer.cell(sts.getVars().size());
 			writer.cell(ExprUtils.nodeCountSize(BoolExprs.And(sts.getInit(), sts.getTrans())));
+			writer.newRow();
 		}
 	}
 
 	private void printError(final Throwable ex) {
 		final String message = ex.getMessage() == null ? "" : ex.getMessage();
 		if (benchmarkMode) {
 			writer.cell("[EX] " + ex.getClass().getSimpleName() + ": " + message);
+			writer.newRow();
 		} else {
 			logger.write(Level.RESULT, "%s occurred, message: %s%n", ex.getClass().getSimpleName(), message);
 			if (stacktrace) {

diff --git a/subprojects/xsts-cli/src/main/java/hu/bme/mit/theta/xsts/cli/XstsCli.java b/subprojects/xsts-cli/src/main/java/hu/bme/mit/theta/xsts/cli/XstsCli.java
@@ -139,9 +139,7 @@ private void run() {
 			}
 		} catch (final Throwable ex) {
 			printError(ex);
-		}
-		if (benchmarkMode) {
-			writer.newRow();
+			System.exit(1);
 		}
 	}
 
@@ -201,13 +199,15 @@ private void printResult(final SafetyResult<?, ?> status, final XSTS sts, final
 				writer.cell("");
 			}
 			writer.cell(sts.getVars().size());
+			writer.newRow();
 		}
 	}
 
 	private void printError(final Throwable ex) {
 		final String message = ex.getMessage() == null ? "" : ex.getMessage();
 		if (benchmarkMode) {
 			writer.cell("[EX] " + ex.getClass().getSimpleName() + ": " + message);
+			writer.newRow();
 		} else {
 			logger.write(Logger.Level.RESULT, "%s occurred, message: %s%n", ex.getClass().getSimpleName(), message);
 			if (stacktrace) {

diff --git a/subprojects/xta-cli/src/main/java/hu/bme/mit/theta/xta/cli/XtaCli.java b/subprojects/xta-cli/src/main/java/hu/bme/mit/theta/xta/cli/XtaCli.java
@@ -113,6 +113,7 @@ private void run() {
 			}
 		} catch (final Throwable ex) {
 			printError(ex);
+			System.exit(1);
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,6 +113,7 @@ private void run() { @@
     			}
     		} catch (final Throwable ex) {
     			printError(ex);
+    			System.exit(1);
     		}
     	}
@@ Expand Down @@