From 050baee3f2cee997a5951a608c06a10a093fbdf4 Mon Sep 17 00:00:00 2001 From: Jean-Marie Henaff Date: Fri, 17 Apr 2015 10:09:32 +0200 Subject: Explicitely ignore some tests with Jill test toolchain Bug: 20157629 Change-Id: I91bfcf55377cfdabaa0f52eede4e41cf5748d7c5 --- .../com/android/jack/classpath/ClasspathTests.java | 5 +- .../com/android/jack/frontend/FrontEndTests.java | 7 +- .../tests/com/android/jack/shrob/AbstractTest.java | 10 ++ .../jack/shrob/ObfuscationWithMappingTests.java | 145 +++++++++++++++++++++ .../tests/com/android/jack/shrob/SeedTests.java | 141 ++++++++++++++++++++ .../android/jack/shrob/ShrinkMultiDexTests.java | 110 ++++++++++++++++ .../tests/com/android/jack/shrob/ShrinkTests.java | 109 ++++++++++++++++ .../com/android/jack/shrob/ShrobRuntimeTests.java | 3 +- 8 files changed, 527 insertions(+), 3 deletions(-) (limited to 'jack-tests/tests') diff --git a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java index f211b62..19d7c91 100644 --- a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java +++ b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java @@ -25,6 +25,7 @@ import com.android.jack.test.toolchain.IToolchain; import com.android.jack.test.toolchain.JackApiToolchainBase; import com.android.jack.test.toolchain.JackBasedToolchain; import com.android.jack.test.toolchain.JillBasedToolchain; +import com.android.jack.test.toolchain.LegacyJillToolchain; import junit.framework.Assert; @@ -162,7 +163,9 @@ public class ClasspathTests { @Test public void testMissingClasspathEntry() throws Exception { - JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + List> exclude = new ArrayList>(1); + exclude.add(LegacyJillToolchain.class); + JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude); File srcDir = AbstractTestTools.getTestRootDir("com.android.jack.classpath.test004.jack"); File testOut = AbstractTestTools.createTempFile("ClasspathTest", "missing"); ByteArrayOutputStream errOut = new ByteArrayOutputStream(); diff --git a/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java b/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java index aec7659..3aa134c 100644 --- a/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java +++ b/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java @@ -23,6 +23,7 @@ import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.IToolchain; import com.android.jack.test.toolchain.JackApiToolchainBase; import com.android.jack.test.toolchain.JackBasedToolchain; +import com.android.jack.test.toolchain.JillBasedToolchain; import junit.framework.Assert; @@ -31,6 +32,8 @@ import org.junit.experimental.categories.Category; import java.io.ByteArrayOutputStream; import java.io.File; +import java.util.ArrayList; +import java.util.List; public class FrontEndTests { @@ -154,7 +157,9 @@ public class FrontEndTests { public void testUninstanciableLocalClass001() throws Exception { File outDir = AbstractTestTools.createTempDir(); - IToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + List> excludeList = new ArrayList>(1); + excludeList.add(JillBasedToolchain.class); + IToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, excludeList); ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream err = new ByteArrayOutputStream(); toolchain.setOutputStream(out); diff --git a/jack-tests/tests/com/android/jack/shrob/AbstractTest.java b/jack-tests/tests/com/android/jack/shrob/AbstractTest.java index a2af566..06e2456 100644 --- a/jack-tests/tests/com/android/jack/shrob/AbstractTest.java +++ b/jack-tests/tests/com/android/jack/shrob/AbstractTest.java @@ -23,6 +23,8 @@ import com.android.jack.ProguardFlags; import com.android.jack.test.category.KnownBugs; import com.android.jack.test.category.SlowTests; import com.android.jack.test.toolchain.AbstractTestTools; +import com.android.jack.test.toolchain.IToolchain; +import com.android.jack.test.toolchain.LegacyJillToolchain; import org.junit.BeforeClass; import org.junit.Test; @@ -33,6 +35,8 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; import javax.annotation.Nonnull; @@ -595,4 +599,10 @@ public abstract class AbstractTest { public void test41_001() throws Exception { runTest("041", "001", ""); } + + protected void checkToolchainIsNotJillBased() { + List> excludeList = new ArrayList>(1); + excludeList.add(LegacyJillToolchain.class); + IToolchain toolchain = AbstractTestTools.getCandidateToolchain(IToolchain.class, excludeList); + } } diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java index fc47485..fe3f2b2 100644 --- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java @@ -16,15 +16,23 @@ package com.android.jack.shrob; +import com.android.jack.test.category.SlowTests; import com.android.jack.test.comparator.ComparatorMapping; import com.android.jack.test.helper.SourceToDexComparisonTestHelper; import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.DummyToolchain; +import com.android.jack.test.toolchain.IToolchain; import com.android.jack.test.toolchain.JackBasedToolchain; +import com.android.jack.test.toolchain.LegacyJillToolchain; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import javax.annotation.Nonnull; @@ -90,4 +98,141 @@ public class ObfuscationWithMappingTests extends AbstractTest { public void test35_001() throws Exception { // Test 34 already has a partial mapping, it can't be used in this test suite. } + + @Test + @Category(SlowTests.class) + @Override + public void test1_009() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_009(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_010() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_010(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_011() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_011(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_012() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_012(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_014() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_014(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_015() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_015(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_016() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_016(); + } + + @Test + @Override + public void test5_005() throws Exception { + checkToolchainIsNotJillBased(); + super.test5_005(); + } + + @Test + @Override + public void test8_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test8_001(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test8_002() throws Exception { + checkToolchainIsNotJillBased(); + super.test8_002(); + } + + @Test + @Override + public void test10_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test10_001(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test11_002() throws Exception { + checkToolchainIsNotJillBased(); + super.test11_002(); + } + + @Test + @Override + public void test15_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test15_001(); + } + + @Test + @Override + public void test17_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test17_001(); + } + + @Test + @Override + public void test19_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test19_001(); + } + + @Test + @Override + public void test36_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test36_001(); + } + + @Test + @Override + public void test38_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test38_001(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test40_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test40_001(); + } + } diff --git a/jack-tests/tests/com/android/jack/shrob/SeedTests.java b/jack-tests/tests/com/android/jack/shrob/SeedTests.java index 8dcbe6b..466eab6 100644 --- a/jack-tests/tests/com/android/jack/shrob/SeedTests.java +++ b/jack-tests/tests/com/android/jack/shrob/SeedTests.java @@ -63,9 +63,150 @@ public class SeedTests extends AbstractTest { env.runTest(new ComparatorSeeds(refOutputSeeds, candidateOutputSeeds)); } + @Test + @Category(SlowTests.class) + @Override + public void test1_002() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_002(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_019() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_019(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_022() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_022(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test6_002() throws Exception { + checkToolchainIsNotJillBased(); + super.test6_002(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test6_004() throws Exception { + checkToolchainIsNotJillBased(); + super.test6_004(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test6_005() throws Exception { + checkToolchainIsNotJillBased(); + super.test6_005(); + } + + @Test + @Override + public void test15_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test15_001(); + } + + @Test + @Override + public void test16_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test16_001(); + } + + @Test + @Override + public void test29_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test29_001(); + } + + @Test + @Override + public void test30_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test30_001(); + } + + @Test + @Override + public void test31_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test31_001(); + } + + @Test + @Override + public void test32_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test32_001(); + } + + @Test + @Override + public void test33_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test33_001(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test33_002() throws Exception { + checkToolchainIsNotJillBased(); + super.test33_002(); + } + + @Test + @Override + public void test34_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test34_001(); + } + + @Test + @Override + public void test35_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test35_001(); + } + + @Test + @Override + public void test36_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test36_001(); + } + + @Test + @Override + public void test37_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test37_001(); + } + + @Test + @Override + public void test38_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test38_001(); + } + @Override @Test public void test41_001() throws Exception { + checkToolchainIsNotJillBased(); super.test41_001(); } } diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java index d21cdf2..236a268 100644 --- a/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java @@ -23,6 +23,7 @@ import com.android.jack.backend.dex.DexFileWriter; import com.android.jack.backend.dex.MultiDexLegacy; import com.android.jack.preprocessor.PreProcessor; import com.android.jack.shrob.shrink.ShrinkStructurePrinter; +import com.android.jack.test.category.SlowTests; import com.android.jack.test.comparator.ComparatorMapping; import com.android.jack.test.helper.SourceToDexComparisonTestHelper; import com.android.jack.test.toolchain.AbstractTestTools; @@ -30,6 +31,8 @@ import com.android.jack.test.toolchain.DummyToolchain; import com.android.jack.test.toolchain.JackBasedToolchain; import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.File; @@ -91,4 +94,111 @@ public class ShrinkMultiDexTests extends AbstractTest { candidateNodeListing)); } + @Test + @Category(SlowTests.class) + @Override + public void test1_009() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_009(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_010() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_010(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_011() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_011(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_012() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_012(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_014() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_014(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_015() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_015(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_016() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_016(); + } + + @Test + @Override + public void test8_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test8_001(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test11_002() throws Exception { + checkToolchainIsNotJillBased(); + super.test11_002(); + } + + @Test + @Override + public void test17_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test17_001(); + } + + @Test + @Override + public void test19_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test19_001(); + } + + @Test + @Override + public void test36_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test36_001(); + } + + @Test + @Override + public void test38_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test38_001(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test40_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test40_001(); + } + } diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java index c5fcfd6..9053d38 100644 --- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java @@ -20,6 +20,7 @@ import com.android.jack.Main; import com.android.jack.Options; import com.android.jack.ProguardFlags; import com.android.jack.shrob.shrink.ShrinkStructurePrinter; +import com.android.jack.test.category.SlowTests; import com.android.jack.test.comparator.ComparatorMapping; import com.android.jack.test.helper.SourceToDexComparisonTestHelper; import com.android.jack.test.toolchain.AbstractTestTools; @@ -30,6 +31,7 @@ import com.android.jack.util.TextUtils; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.File; @@ -268,16 +270,123 @@ public class ShrinkTests extends AbstractTest { @Test public void test42_001() throws Exception { + checkToolchainIsNotJillBased(); runTest("042", "001", ""); } @Test public void test42_002() throws Exception { + checkToolchainIsNotJillBased(); runTest("042", "002", ""); } @Test public void test42_003() throws Exception { + checkToolchainIsNotJillBased(); runTest("042", "003", ""); } + + + @Test + @Category(SlowTests.class) + @Override + public void test1_009() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_009(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_010() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_010(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_011() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_011(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_012() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_012(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_014() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_014(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_015() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_015(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test1_016() throws Exception { + checkToolchainIsNotJillBased(); + super.test1_016(); + } + + @Override + public void test8_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test8_001(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test11_002() throws Exception { + checkToolchainIsNotJillBased(); + super.test11_002(); + } + + @Override + public void test17_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test17_001(); + } + + @Override + public void test19_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test19_001(); + } + + @Override + public void test36_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test36_001(); + } + + @Override + public void test38_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test38_001(); + } + + @Test + @Category(SlowTests.class) + @Override + public void test40_001() throws Exception { + checkToolchainIsNotJillBased(); + super.test40_001(); + } + } diff --git a/jack-tests/tests/com/android/jack/shrob/ShrobRuntimeTests.java b/jack-tests/tests/com/android/jack/shrob/ShrobRuntimeTests.java index e1ad672..253ece3 100644 --- a/jack-tests/tests/com/android/jack/shrob/ShrobRuntimeTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ShrobRuntimeTests.java @@ -20,6 +20,7 @@ import com.android.jack.test.helper.RuntimeTestHelper; import com.android.jack.test.runtime.RuntimeTest; import com.android.jack.test.runtime.RuntimeTestInfo; import com.android.jack.test.toolchain.AbstractTestTools; +import com.android.jack.test.toolchain.LegacyJillToolchain; import org.junit.Test; @@ -56,7 +57,7 @@ public class ShrobRuntimeTests extends RuntimeTest { @Test public void test011_2() throws Exception { - new RuntimeTestHelper(TEST011_2) + new RuntimeTestHelper(TEST011_2).addIgnoredCandidateToolchain(LegacyJillToolchain.class) .compileAndRunTest(); } -- cgit v1.1