diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-06-12 16:29:20 +0200 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-06-24 13:53:21 +0200 |
commit | f1828481ebcfee3bddc323fca178a4502a60ceef (patch) | |
tree | 1a706277eaae29edc8f7f8532f7686383689cc95 /jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java | |
parent | c33c369849c5864b1e918fb4995cd88a2f67aba4 (diff) | |
download | toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.tar.gz toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.tar.bz2 toolchain_jack-f1828481ebcfee3bddc323fca178a4502a60ceef.zip |
Remove assertion status from Jack sanity checks
- adds a property to set when invoking ant to disable assertion (-Dtests.disable-assertions=true)
- remove assertion status modification done in tests
(cherry picked from commit 9fcbabb82e5292b7df75ea396eddd34ea8a1558c)
Change-Id: Ibfc41fc8b0e7e47c597d3f92e420dfb151681396
Diffstat (limited to 'jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java')
-rw-r--r-- | jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java index 236a268a..efa0a0f5 100644 --- a/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java @@ -49,10 +49,7 @@ public class ShrinkMultiDexTests extends AbstractTest { private static ProguardFlags dontObfuscateFlagFile = new ProguardFlags(shrobTestsDir, "dontobfuscate.flags"); - @BeforeClass - public static void setUpClass() { - Main.class.getClassLoader().setDefaultAssertionStatus(true); - } + @Override protected void runTest( |