Add an option to specify the exit code for when a bug is encountered

mrigger · mrigger · commit 2e66d0f76417 · 2020-06-08T20:21:17.000+02:00
diff --git a/src/sqlancer/Main.java b/src/sqlancer/Main.java
@@ -39,7 +39,6 @@
 
 public final class Main {
 
-    private static final int THREADS_SHUTDOWN_EXIT_CODE = -1;
     public static final File LOG_DIRECTORY = new File("logs");
     public static volatile AtomicLong nrQueries = new AtomicLong();
     public static volatile AtomicLong nrDatabases = new AtomicLong();
@@ -305,7 +304,7 @@ public static int executeMain(String[] args) throws AssertionError {
         jc.parse(args);
         if (jc.getParsedCommand() == null) {
             jc.usage();
-            return THREADS_SHUTDOWN_EXIT_CODE;
+            return options.getErrorExitCode();
         }
 
         if (options.printProgressInformation()) {
@@ -407,7 +406,7 @@ private void runThread(final String databaseName) {
                 e.printStackTrace();
             }
         }
-        return threadsShutdown == 0 ? 0 : THREADS_SHUTDOWN_EXIT_CODE;
+        return threadsShutdown == 0 ? 0 : options.getErrorExitCode();
     }
 
     private static void startProgressMonitor() {
diff --git a/src/sqlancer/MainOptions.java b/src/sqlancer/MainOptions.java
@@ -44,6 +44,9 @@ public class MainOptions {
     @Parameter(names = "--timeout-seconds", description = "The timeout in seconds")
     private int timeoutSeconds = -1;
 
+    @Parameter(names = "--exit-code-error", description = "The exit code that should be returned when an error is encountered (or a bug is found)")
+    private int errorExitCode = -1;
+
     public int getMaxExpressionDepth() {
         return maxExpressionDepth;
     }
@@ -103,4 +106,8 @@ public int getTimeoutSeconds() {
         return timeoutSeconds;
     }
 
+    public int getErrorExitCode() {
+        return errorExitCode;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@`
`39`	`39`
`40`	`40`	`public final class Main {`
`41`	`41`
`42`		`- private static final int THREADS_SHUTDOWN_EXIT_CODE = -1;`
`43`	`42`	`public static final File LOG_DIRECTORY = new File("logs");`
`44`	`43`	`public static volatile AtomicLong nrQueries = new AtomicLong();`
`45`	`44`	`public static volatile AtomicLong nrDatabases = new AtomicLong();`
`@@ -305,7 +304,7 @@ public static int executeMain(String[] args) throws AssertionError {`
`305`	`304`	`jc.parse(args);`
`306`	`305`	`if (jc.getParsedCommand() == null) {`
`307`	`306`	`jc.usage();`
`308`		`- return THREADS_SHUTDOWN_EXIT_CODE;`
	`307`	`+ return options.getErrorExitCode();`
`309`	`308`	`}`
`310`	`309`
`311`	`310`	`if (options.printProgressInformation()) {`
`@@ -407,7 +406,7 @@ private void runThread(final String databaseName) {`
`407`	`406`	`e.printStackTrace();`
`408`	`407`	`}`
`409`	`408`	`}`
`410`		`- return threadsShutdown == 0 ? 0 : THREADS_SHUTDOWN_EXIT_CODE;`
	`409`	`+ return threadsShutdown == 0 ? 0 : options.getErrorExitCode();`
`411`	`410`	`}`
`412`	`411`
`413`	`412`	`private static void startProgressMonitor() {`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,9 @@ public class MainOptions {`
`44`	`44`	`@Parameter(names = "--timeout-seconds", description = "The timeout in seconds")`
`45`	`45`	`private int timeoutSeconds = -1;`
`46`	`46`
	`47`	`+ @Parameter(names = "--exit-code-error", description = "The exit code that should be returned when an error is encountered (or a bug is found)")`
	`48`	`+ private int errorExitCode = -1;`
	`49`	`+`
`47`	`50`	`public int getMaxExpressionDepth() {`
`48`	`51`	`return maxExpressionDepth;`
`49`	`52`	`}`
`@@ -103,4 +106,8 @@ public int getTimeoutSeconds() {`
`103`	`106`	`return timeoutSeconds;`
`104`	`107`	`}`
`105`	`108`
	`109`	`+ public int getErrorExitCode() {`
	`110`	`+ return errorExitCode;`
	`111`	`+ }`
	`112`	`+`
`106`	`113`	`}`