summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2015-02-10 14:49:21 +0100
committerJean-Marie Henaff <jmhenaff@google.com>2015-03-05 15:16:34 +0100
commit8ec8400f816e1cc6bce3dc48f6589938b8aed16a (patch)
treec2e7fab56f38bf033230b725f3af387cc6846abe
parent67a7b915fb96a41f17f52af8d1688c4d2458f6ee (diff)
downloadtoolchain_jack-8ec8400f816e1cc6bce3dc48f6589938b8aed16a.zip
toolchain_jack-8ec8400f816e1cc6bce3dc48f6589938b8aed16a.tar.gz
toolchain_jack-8ec8400f816e1cc6bce3dc48f6589938b8aed16a.tar.bz2
Change AllTests classes organization
Jack unit tests were listed twice when PreSubmitTests or LongLastingTests were executed. Change-Id: Ia3288fd2a5a45b60c8bd5ce9ff01b1d4cc9b00f8
-rw-r--r--build.xml2
-rw-r--r--jack-tests/tests/com/android/jack/AllTests.java1
-rw-r--r--jack-tests/tests/com/android/jack/AllWithJackTests.java12
3 files changed, 13 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 0afabbf..407ac2e 100644
--- a/build.xml
+++ b/build.xml
@@ -1336,7 +1336,7 @@
<classpath>
<filelist refid="jack.junit.tests.classpath" />
</classpath>
- <test name="com.android.jack.AllTests"
+ <test name="com.android.jack.AllWithJackTests"
todir="${jack.tests.output}/test-jack-all/"
outfile="AllTestsResults" />
</junit>
diff --git a/jack-tests/tests/com/android/jack/AllTests.java b/jack-tests/tests/com/android/jack/AllTests.java
index 217d9a6..1ad2bd6 100644
--- a/jack-tests/tests/com/android/jack/AllTests.java
+++ b/jack-tests/tests/com/android/jack/AllTests.java
@@ -70,7 +70,6 @@ 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/AllWithJackTests.java b/jack-tests/tests/com/android/jack/AllWithJackTests.java
new file mode 100644
index 0000000..f23eeaf
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/AllWithJackTests.java
@@ -0,0 +1,12 @@
+package com.android.jack;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses(value = {
+ AllUnitTests.class,
+ AllTests.class
+ })
+public class AllWithJackTests {}