Enable assertions in Ant test tasks and force sanity checks

Change-Id: Iac9ce0334d21c727a6086bb0c0a1dc426b0ac82b

3 files changed, 18 insertions, 0 deletions

diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
index 63b557fd..a194d08d 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java
@@ -98,6 +98,8 @@ public class JackApiToolchain extends JackBasedToolchain {
   private void srcToCommon(@CheckForNull String classpath, @Nonnull File... sources) {
     addProperties(properties, jackOptions);
 
+    jackOptions.setSanityChecks(sanityChecks);
+
     if (jackOptions.getFlags() != null) {
       jackOptions.applyShrobFlags();
     }
@@ -175,6 +177,8 @@ public class JackApiToolchain extends JackBasedToolchain {
   private void libToCommon(@Nonnull File[] in) {
     addProperties(properties, jackOptions);
 
+    jackOptions.setSanityChecks(sanityChecks);
+
     jackOptions.setJarjarRulesFile(jarjarRules);
 
     if (jackOptions.getFlags() != null) {
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
index 9a4fbd37..8a25e6b9 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
@@ -55,6 +55,8 @@ public abstract class JackBasedToolchain extends AndroidToolchain {
   @Nonnull
   protected List<File> resImport = new ArrayList<File>();
 
+  protected boolean sanityChecks = true;
+
   @Nonnull
   public final JackBasedToolchain addProperty(@Nonnull String propertyName,
       @Nonnull String propertyValue) {
@@ -140,6 +142,12 @@ public abstract class JackBasedToolchain extends AndroidToolchain {
   @Nonnull
   protected abstract JackBasedToolchain setVerbosityLevel(@Nonnull Options.VerbosityLevel level);
 
+  @Nonnull
+  public JackBasedToolchain setSanityChecks(boolean sanityChecks){
+    this.sanityChecks = sanityChecks;
+    return this;
+  }
+
   @Override
   @Nonnull
   public JackBasedToolchain enableDxOptimizations() {
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
index 243940f7..3322d95d 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
@@ -144,6 +144,9 @@ public class JackCliToolchain extends JackBasedToolchain {
     args.add("--verbose");
     args.add(verbosityLevel.name());
 
+    args.add("--sanity-checks");
+    args.add(Boolean.toString(sanityChecks));
+
     if (incrementalFolder != null) {
       args.add("--incremental-folder");
       args.add(incrementalFolder.getAbsolutePath());
@@ -250,6 +253,9 @@ public class JackCliToolchain extends JackBasedToolchain {
     args.add("--verbose");
     args.add(verbosityLevel.name());
 
+    args.add("--sanity-checks");
+    args.add(Boolean.toString(sanityChecks));
+
     if (incrementalFolder != null) {
       args.add("--incremental-folder");
       args.add(incrementalFolder.getAbsolutePath());