Merge "Enable assertions in Ant test tasks and force sanity checks" into ub-jack

5 files changed, 26 insertions, 0 deletions

diff --git a/build.xml b/build.xml
index fc23cd6..c231943 100644
--- a/build.xml
+++ b/build.xml
@@ -1223,6 +1223,7 @@
     <junit fork="yes" errorproperty="test-jack.failure">
       <formatter type="xml"/>
       <jvmarg value="-Dtests.config=${tests.config}"/>
+      <jvmarg value="-ea"/>
        <classpath>
         <filelist refid="junit.tests.classpath" />
        </classpath>
@@ -1244,6 +1245,7 @@
       <junit fork="yes" errorproperty="test-jack.failure">
         <formatter type="xml"/>
         <jvmarg value="-Dtests.config=${tests.config}"/>
+        <jvmarg value="-ea"/>
         <classpath>
           <filelist refid="junit.tests.classpath" />
         </classpath>
@@ -1265,6 +1267,7 @@
       <junit fork="yes" errorproperty="test-jack.failure">
         <formatter type="xml"/>
         <jvmarg value="-Dtests.config=${tests.config}"/>
+        <jvmarg value="-ea"/>
         <classpath>
           <filelist refid="junit.tests.classpath" />
         </classpath>
@@ -1285,6 +1288,7 @@
     freemarker-lib,maths-lib">
       <mkdir dir="${test-jack.output.dir}/Sched/html"/>
       <junit fork="yes" errorproperty="test-jack.failure">
+        <jvmarg value="-ea"/>
         <formatter type="xml"/>
         <classpath>
           <filelist dir="/">
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 63b557f..a194d08 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 9a4fbd3..8a25e6b 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 243940f..3322d95 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());
diff --git a/jack/src/com/android/jack/Options.java b/jack/src/com/android/jack/Options.java
index fc75d09..820aa17 100644
--- a/jack/src/com/android/jack/Options.java
+++ b/jack/src/com/android/jack/Options.java
@@ -882,6 +882,10 @@ public class Options {
     properties.put(CodeItemBuilder.DEX_OPTIMIZE.getName(), "false");
   }
 
+  public void setSanityChecks(boolean sanityChecks) {
+    this.sanityChecks = sanityChecks;
+  }
+
   @Nonnull
   public List<File> getImportedLibraries() {
     return importedLibraries;