diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-01-21 12:15:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-21 12:15:55 +0000 |
| commit | db0951484f733331a24b76422886901a313fc49b (patch) | |
| tree | 4a4e0c26b145a5d0f9fe062121060aed9e2eecc5 /jack-tests/tests | |
| parent | f9d15a028d9ab6d3d7c352922d74b7d9528d1060 (diff) | |
| parent | 0a368a4c04526f53f88d794972f2b0a389bcde20 (diff) | |
| download | toolchain_jack-db0951484f733331a24b76422886901a313fc49b.zip toolchain_jack-db0951484f733331a24b76422886901a313fc49b.tar.gz toolchain_jack-db0951484f733331a24b76422886901a313fc49b.tar.bz2 | |
Merge "Link jack-tests test suites to their jack counter parts" into ub-jack
Diffstat (limited to 'jack-tests/tests')
| -rw-r--r-- | jack-tests/tests/com/android/jack/AllTests.java | 1 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/LongLastingTests.java | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/PreSubmitTests.java | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/jack-tests/tests/com/android/jack/AllTests.java b/jack-tests/tests/com/android/jack/AllTests.java index 1ad2bd6..217d9a6 100644 --- a/jack-tests/tests/com/android/jack/AllTests.java +++ b/jack-tests/tests/com/android/jack/AllTests.java @@ -70,6 +70,7 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses(value = { + AllUnitTests.class, AnnotationTests.class, ArithmeticTests.class, ArrayTests.class, diff --git a/jack-tests/tests/com/android/jack/LongLastingTests.java b/jack-tests/tests/com/android/jack/LongLastingTests.java index d0a3f40..be6019b 100644 --- a/jack-tests/tests/com/android/jack/LongLastingTests.java +++ b/jack-tests/tests/com/android/jack/LongLastingTests.java @@ -35,6 +35,6 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Categories.class) @IncludeCategory(SlowTests.class) @ExcludeCategory(KnownBugs.class) -@SuiteClasses(value = {AllTests.class}) +@SuiteClasses(value = {AllTests.class, LongLastingUnitTests.class}) public class LongLastingTests { } diff --git a/jack-tests/tests/com/android/jack/PreSubmitTests.java b/jack-tests/tests/com/android/jack/PreSubmitTests.java index ac87771..3e0c95c 100644 --- a/jack-tests/tests/com/android/jack/PreSubmitTests.java +++ b/jack-tests/tests/com/android/jack/PreSubmitTests.java @@ -29,6 +29,6 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(Categories.class) @ExcludeCategory(NonPreSubmitTests.class) -@SuiteClasses(value = {AllWithRegressionTests.class}) +@SuiteClasses(value = {AllWithRegressionTests.class, PreSubmitUnitTests.class}) public class PreSubmitTests { } |