1 files changed, 23 insertions, 2 deletions
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 280f8c9b..3542d03e 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
@@ -22,6 +22,7 @@ import com.android.jack.util.ExecuteFile;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -43,6 +44,10 @@ public class JackCliToolchain extends JackBasedToolchain {
   protected File incrementalFolder;
   @Nonnull
   protected Options.VerbosityLevel verbosityLevel = VerbosityLevel.WARNING;
+  @Nonnull
+  protected final Map<String, String> properties = new HashMap<String, String>();
+
+  protected boolean sanityChecks = true;
 
   JackCliToolchain(@Nonnull File prebuilt) {
     this.jackPrebuilt = prebuilt;
@@ -50,8 +55,9 @@ public class JackCliToolchain extends JackBasedToolchain {
 
   @Override
   @Nonnull
-  protected JackCliToolchain setVerbosityLevel(@Nonnull Options.VerbosityLevel level) {
-    verbosityLevel = level;
+  public JackCliToolchain setVerbose(boolean isVerbose) {
+    super.setVerbose(isVerbose);
+    verbosityLevel = isVerbose ? VerbosityLevel.DEBUG : VerbosityLevel.WARNING;
     return this;
   }
 
@@ -306,6 +312,14 @@ public class JackCliToolchain extends JackBasedToolchain {
     return this;
   }
 
+  @Override
+  @Nonnull
+  public JackBasedToolchain addProperty(@Nonnull String propertyName,
+      @Nonnull String propertyValue) {
+    properties.put(propertyName, propertyValue);
+    return this;
+  }
+
   protected static void addProperties(@Nonnull Map<String, String> properties,
       @Nonnull List<String> args) {
     for (Entry<String, String> entry : properties.entrySet()) {
@@ -314,4 +328,11 @@ public class JackCliToolchain extends JackBasedToolchain {
     }
   }
 
+  @Override
+  @Nonnull
+  public JackBasedToolchain setSanityChecks(boolean sanityChecks){
+    this.sanityChecks = sanityChecks;
+    return this;
+  }
+
 }