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 | |
| parent | f9d15a028d9ab6d3d7c352922d74b7d9528d1060 (diff) | |
| parent | 0a368a4c04526f53f88d794972f2b0a389bcde20 (diff) | |
| download | toolchain_jack-db0951484f733331a24b76422886901a313fc49b.tar.gz toolchain_jack-db0951484f733331a24b76422886901a313fc49b.tar.bz2 toolchain_jack-db0951484f733331a24b76422886901a313fc49b.zip | |
Merge "Link jack-tests test suites to their jack counter parts" into ub-jack
Diffstat (limited to 'jack/tests')
| -rw-r--r-- | jack/tests/com/android/jack/AllTestsWithoutKnownBugs.java | 2 | ||||
| -rw-r--r-- | jack/tests/com/android/jack/AllUnitTests.java (renamed from jack/tests/com/android/jack/AllTests.java) | 2 | ||||
| -rw-r--r-- | jack/tests/com/android/jack/LongLastingUnitTests.java (renamed from jack/tests/com/android/jack/LongLastingTests.java) | 4 | ||||
| -rw-r--r-- | jack/tests/com/android/jack/PreSubmitUnitTests.java (renamed from jack/tests/com/android/jack/PreSubmitTests.java) | 4 | ||||
| -rw-r--r-- | jack/tests/com/android/jack/RedundantTestSuite.java | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/jack/tests/com/android/jack/AllTestsWithoutKnownBugs.java b/jack/tests/com/android/jack/AllTestsWithoutKnownBugs.java index 683e265f..90f4e5b4 100644 --- a/jack/tests/com/android/jack/AllTestsWithoutKnownBugs.java +++ b/jack/tests/com/android/jack/AllTestsWithoutKnownBugs.java @@ -29,6 +29,6 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(Categories.class) @ExcludeCategory(KnownBugs.class) -@SuiteClasses(value = {AllTests.class}) +@SuiteClasses(value = {AllUnitTests.class}) public class AllTestsWithoutKnownBugs { } diff --git a/jack/tests/com/android/jack/AllTests.java b/jack/tests/com/android/jack/AllUnitTests.java index 74ae7838..018ed436 100644 --- a/jack/tests/com/android/jack/AllTests.java +++ b/jack/tests/com/android/jack/AllUnitTests.java @@ -59,5 +59,5 @@ import org.junit.runners.Suite.SuiteClasses; UnaryTest.class, UselessCastRemoverTest.class, TracingTest.class}) -public class AllTests { +public class AllUnitTests { } diff --git a/jack/tests/com/android/jack/LongLastingTests.java b/jack/tests/com/android/jack/LongLastingUnitTests.java index 029ae5b7..fdb76ac1 100644 --- a/jack/tests/com/android/jack/LongLastingTests.java +++ b/jack/tests/com/android/jack/LongLastingUnitTests.java @@ -33,6 +33,6 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Categories.class) @IncludeCategory(SlowTests.class) @ExcludeCategory(KnownBugs.class) -@SuiteClasses(value = {AllTests.class}) -public class LongLastingTests { +@SuiteClasses(value = {AllUnitTests.class}) +public class LongLastingUnitTests { } diff --git a/jack/tests/com/android/jack/PreSubmitTests.java b/jack/tests/com/android/jack/PreSubmitUnitTests.java index 0d011d30..c6ed6abd 100644 --- a/jack/tests/com/android/jack/PreSubmitTests.java +++ b/jack/tests/com/android/jack/PreSubmitUnitTests.java @@ -29,6 +29,6 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(Categories.class) @ExcludeCategory(NonPreSubmitTests.class) -@SuiteClasses(value = {AllTests.class}) -public class PreSubmitTests { +@SuiteClasses(value = {AllUnitTests.class}) +public class PreSubmitUnitTests { } diff --git a/jack/tests/com/android/jack/RedundantTestSuite.java b/jack/tests/com/android/jack/RedundantTestSuite.java index b70700b0..677d698a 100644 --- a/jack/tests/com/android/jack/RedundantTestSuite.java +++ b/jack/tests/com/android/jack/RedundantTestSuite.java @@ -29,6 +29,6 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(Categories.class) @IncludeCategory(RedundantTests.class) -@SuiteClasses(value = {AllTests.class}) +@SuiteClasses(value = {AllUnitTests.class}) public class RedundantTestSuite { } |