Split test command line on device runner

Command line size on device is limited, and RegressionTests requires
a lot of test case to be listed.

Change-Id: I7ec8a363c434761bd3ea33784723730ac4ce9055

1 files changed, 10 insertions, 6 deletions

diff --git a/jack-tests/src/com/android/jack/test/runner/ArtRunnerHost.java b/jack-tests/src/com/android/jack/test/runner/ArtRunnerHost.java
index c9a46fb..6c6cc87 100644
--- a/jack-tests/src/com/android/jack/test/runner/ArtRunnerHost.java
+++ b/jack-tests/src/com/android/jack/test/runner/ArtRunnerHost.java
@@ -32,14 +32,16 @@ public class ArtRunnerHost extends HostRunner {
   }
 
   @Override
-  public int run(@Nonnull String[] options, @Nonnull String[] mainClasses,
-      @Nonnull File... classpathFiles) throws RuntimeRunnerException {
-    return runOnHost(buildCommandLine(options, mainClasses, classpathFiles), "ANDROID_HOST_OUT");
+  public int runJUnit(@Nonnull String[] options, @Nonnull String jUnitRunnerName,
+      @Nonnull String[] jUnitTestClasses, @Nonnull File... classpathFiles)
+      throws RuntimeRunnerException {
+    return runOnHost(buildCommandLine(options, jUnitRunnerName, jUnitTestClasses, classpathFiles),
+        "ANDROID_HOST_OUT");
   }
 
   @Nonnull
-  private List<String> buildCommandLine(@Nonnull String[] options, @Nonnull String[] mainClasses,
-      @Nonnull File... classpathFiles) {
+  private List<String> buildCommandLine(@Nonnull String[] options, @Nonnull String jUnitRunnerName,
+      @Nonnull String[] jUnitTestClasses, @Nonnull File... classpathFiles) {
     List<String> args = new ArrayList<String>();
 
     args.add(rtEnvironmentRootDir.getAbsolutePath() + "/bin/art");
@@ -58,7 +60,9 @@ public class ArtRunnerHost extends HostRunner {
     }
     args.add(sb.toString());
 
-    for (String className : mainClasses) {
+    args.add(jUnitRunnerName);
+
+    for (String className : jUnitTestClasses) {
       args.add(className);
     }
     return args;