downloaded a fresh copy of Daikon; make assertNormalExitValue call de…

…pendent of whether we are running daikonCheck or not.
SRI-CSL · Dec 7, 2023 · a1a2c2e · a1a2c2e
1 parent b3438a8
commit a1a2c2e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/consumer/libs/ChicoryPremain.jar b/consumer/libs/ChicoryPremain.jar
diff --git a/consumer/libs/daikon.jar b/consumer/libs/daikon.jar
diff --git a/consumer/libs/dcomp_premain.jar b/consumer/libs/dcomp_premain.jar
diff --git a/src/main/java/com/sri/gradle/daikon/internal/MainExecutor.java b/src/main/java/com/sri/gradle/daikon/internal/MainExecutor.java
@@ -77,7 +77,14 @@ public void execDaikon(DaikonExecSpec daikonSpec){
       daikonSpec.getConfigureFork().forEach(forkAction -> forkAction.execute(spec));
     });
 
-    result.assertNormalExitValue();
+    if (result.toString().contains("Usage:")){
+      project.getLogger().debug("Checking daikon.jar is in the classpath; "
+          + "no need to assert normal exit value");
+    } else {
+      // assert this only after executing 'daikonCheck'
+      result.assertNormalExitValue();
+    }
+
   }
 
   public void execPrintDaikonInfo(List<File> classPath, String classNamePrefix, Path outputDir){