Rename dalvik_jtreg to dalvik_runner.
Now that it runs caliper and JUnit, the old name was awful clumsy.
diff --git a/libcore/tools/dalvik_jtreg/Android.mk b/libcore/tools/dalvik_jtreg/Android.mk
deleted file mode 100644
index 6c3cf1b..0000000
--- a/libcore/tools/dalvik_jtreg/Android.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-ext_dirs := \
- ../../../../external/jsr305/ri/src/main/java \
- ../../../../external/guava/src \
- ../../../../external/caliper/src
-
-ext_src_files := $(call all-java-files-under,$(ext_dirs))
-
-LOCAL_SRC_FILES := \
- $(ext_src_files) \
- java/dalvik/jtreg/Adb.java \
- java/dalvik/jtreg/CaliperFinder.java \
- java/dalvik/jtreg/CaliperRunner.java \
- java/dalvik/jtreg/Classpath.java \
- java/dalvik/jtreg/Command.java \
- java/dalvik/jtreg/CommandFailedException.java \
- java/dalvik/jtreg/DeviceDalvikVm.java \
- java/dalvik/jtreg/Driver.java \
- java/dalvik/jtreg/Dx.java \
- java/dalvik/jtreg/ExpectedResult.java \
- java/dalvik/jtreg/Harness.java \
- java/dalvik/jtreg/JUnitFinder.java \
- java/dalvik/jtreg/JUnitRunner.java \
- java/dalvik/jtreg/JavaVm.java \
- java/dalvik/jtreg/Javac.java \
- java/dalvik/jtreg/JtregFinder.java \
- java/dalvik/jtreg/JtregRunner.java \
- java/dalvik/jtreg/Result.java \
- java/dalvik/jtreg/Strings.java \
- java/dalvik/jtreg/TestRun.java \
- java/dalvik/jtreg/TestFinder.java \
- java/dalvik/jtreg/TestRunner.java \
- java/dalvik/jtreg/Threads.java \
- java/dalvik/jtreg/Vm.java \
- java/dalvik/jtreg/XmlReportPrinter.java \
-
-LOCAL_MODULE:= dalvik_jtreg
-LOCAL_STATIC_JAVA_LIBRARIES := javatest jh jtreg kxml2-2.3.0
-
-# TODO this only works when junit is already built...
-LOCAL_JAVA_LIBRARIES := junit
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-include $(call all-subdir-makefiles)
-
-# prebuilt javatest.jar
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_JAVA_LIBRARIES := javatest:lib/javatest.jar
-include $(BUILD_HOST_PREBUILT)
-
-# prebuilt jh.jar
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_JAVA_LIBRARIES := jh:lib/jh.jar
-include $(BUILD_HOST_PREBUILT)
-
-# prebuilt jtreg.jar
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_JAVA_LIBRARIES := jtreg:lib/jtreg.jar
-include $(BUILD_HOST_PREBUILT)
diff --git a/libcore/tools/runner/Android.mk b/libcore/tools/runner/Android.mk
new file mode 100644
index 0000000..1400351
--- /dev/null
+++ b/libcore/tools/runner/Android.mk
@@ -0,0 +1,63 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+ext_dirs := \
+ ../../../../external/jsr305/ri/src/main/java \
+ ../../../../external/guava/src \
+ ../../../../external/caliper/src
+
+ext_src_files := $(call all-java-files-under,$(ext_dirs))
+
+LOCAL_SRC_FILES := \
+ $(ext_src_files) \
+ java/dalvik/runner/Adb.java \
+ java/dalvik/runner/CaliperFinder.java \
+ java/dalvik/runner/CaliperRunner.java \
+ java/dalvik/runner/Classpath.java \
+ java/dalvik/runner/Command.java \
+ java/dalvik/runner/CommandFailedException.java \
+ java/dalvik/runner/DalvikRunner.java \
+ java/dalvik/runner/DeviceDalvikVm.java \
+ java/dalvik/runner/Driver.java \
+ java/dalvik/runner/Dx.java \
+ java/dalvik/runner/ExpectedResult.java \
+ java/dalvik/runner/JUnitFinder.java \
+ java/dalvik/runner/JUnitRunner.java \
+ java/dalvik/runner/JavaVm.java \
+ java/dalvik/runner/Javac.java \
+ java/dalvik/runner/JtregFinder.java \
+ java/dalvik/runner/JtregRunner.java \
+ java/dalvik/runner/Result.java \
+ java/dalvik/runner/Strings.java \
+ java/dalvik/runner/TestRun.java \
+ java/dalvik/runner/TestFinder.java \
+ java/dalvik/runner/TestRunner.java \
+ java/dalvik/runner/Threads.java \
+ java/dalvik/runner/Vm.java \
+ java/dalvik/runner/XmlReportPrinter.java \
+
+LOCAL_MODULE:= dalvik_runner
+LOCAL_STATIC_JAVA_LIBRARIES := javatest jh jtreg kxml2-2.3.0
+
+# TODO this only works when junit is already built...
+LOCAL_JAVA_LIBRARIES := junit
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(call all-subdir-makefiles)
+
+# prebuilt javatest.jar
+include $(CLEAR_VARS)
+LOCAL_PREBUILT_JAVA_LIBRARIES := javatest:lib/javatest.jar
+include $(BUILD_HOST_PREBUILT)
+
+# prebuilt jh.jar
+include $(CLEAR_VARS)
+LOCAL_PREBUILT_JAVA_LIBRARIES := jh:lib/jh.jar
+include $(BUILD_HOST_PREBUILT)
+
+# prebuilt jtreg.jar
+include $(CLEAR_VARS)
+LOCAL_PREBUILT_JAVA_LIBRARIES := jtreg:lib/jtreg.jar
+include $(BUILD_HOST_PREBUILT)
diff --git a/libcore/tools/dalvik_jtreg/expectations/java.io.BufferedReader.ReadLine.expected b/libcore/tools/runner/expectations/java.io.BufferedReader.ReadLine.expected
similarity index 100%
rename from libcore/tools/dalvik_jtreg/expectations/java.io.BufferedReader.ReadLine.expected
rename to libcore/tools/runner/expectations/java.io.BufferedReader.ReadLine.expected
diff --git a/libcore/tools/dalvik_jtreg/expectations/java.io.BufferedReader.Ready.expected b/libcore/tools/runner/expectations/java.io.BufferedReader.Ready.expected
similarity index 100%
rename from libcore/tools/dalvik_jtreg/expectations/java.io.BufferedReader.Ready.expected
rename to libcore/tools/runner/expectations/java.io.BufferedReader.Ready.expected
diff --git a/libcore/tools/dalvik_jtreg/expectations/java.io.StreamTokenizer.Reset.expected b/libcore/tools/runner/expectations/java.io.StreamTokenizer.Reset.expected
similarity index 100%
rename from libcore/tools/dalvik_jtreg/expectations/java.io.StreamTokenizer.Reset.expected
rename to libcore/tools/runner/expectations/java.io.StreamTokenizer.Reset.expected
diff --git a/libcore/tools/dalvik_jtreg/expectations/java.util.Arrays.Big.expected b/libcore/tools/runner/expectations/java.util.Arrays.Big.expected
similarity index 100%
rename from libcore/tools/dalvik_jtreg/expectations/java.util.Arrays.Big.expected
rename to libcore/tools/runner/expectations/java.util.Arrays.Big.expected
diff --git a/libcore/tools/dalvik_jtreg/expectations/java.util.Arrays.CopyMethods.expected b/libcore/tools/runner/expectations/java.util.Arrays.CopyMethods.expected
similarity index 100%
rename from libcore/tools/dalvik_jtreg/expectations/java.util.Arrays.CopyMethods.expected
rename to libcore/tools/runner/expectations/java.util.Arrays.CopyMethods.expected
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Adb.java b/libcore/tools/runner/java/dalvik/runner/Adb.java
similarity index 97%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Adb.java
rename to libcore/tools/runner/java/dalvik/runner/Adb.java
index ef8508e..d265167 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Adb.java
+++ b/libcore/tools/runner/java/dalvik/runner/Adb.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CaliperFinder.java b/libcore/tools/runner/java/dalvik/runner/CaliperFinder.java
similarity index 97%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CaliperFinder.java
rename to libcore/tools/runner/java/dalvik/runner/CaliperFinder.java
index 421bb7f..e60947d 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CaliperFinder.java
+++ b/libcore/tools/runner/java/dalvik/runner/CaliperFinder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CaliperRunner.java b/libcore/tools/runner/java/dalvik/runner/CaliperRunner.java
similarity index 97%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CaliperRunner.java
rename to libcore/tools/runner/java/dalvik/runner/CaliperRunner.java
index 8928138..514a208 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CaliperRunner.java
+++ b/libcore/tools/runner/java/dalvik/runner/CaliperRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import com.google.caliper.Runner;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Classpath.java b/libcore/tools/runner/java/dalvik/runner/Classpath.java
similarity index 98%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Classpath.java
rename to libcore/tools/runner/java/dalvik/runner/Classpath.java
index 21c200a..86000cb 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Classpath.java
+++ b/libcore/tools/runner/java/dalvik/runner/Classpath.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.util.ArrayList;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Command.java b/libcore/tools/runner/java/dalvik/runner/Command.java
similarity index 99%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Command.java
rename to libcore/tools/runner/java/dalvik/runner/Command.java
index 400a2e0..553ee24 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Command.java
+++ b/libcore/tools/runner/java/dalvik/runner/Command.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CommandFailedException.java b/libcore/tools/runner/java/dalvik/runner/CommandFailedException.java
similarity index 98%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CommandFailedException.java
rename to libcore/tools/runner/java/dalvik/runner/CommandFailedException.java
index e58a80c..d16a279 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/CommandFailedException.java
+++ b/libcore/tools/runner/java/dalvik/runner/CommandFailedException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.util.List;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Harness.java b/libcore/tools/runner/java/dalvik/runner/DalvikRunner.java
similarity index 90%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Harness.java
rename to libcore/tools/runner/java/dalvik/runner/DalvikRunner.java
index 6eb3739..bb96074 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Harness.java
+++ b/libcore/tools/runner/java/dalvik/runner/DalvikRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.util.ArrayList;
@@ -29,9 +29,9 @@
import java.util.logging.Logger;
/**
- * Command line interface for running jtreg tests.
+ * Command line interface for running benchmarks and tests on dalvik.
*/
-public final class Harness {
+public final class DalvikRunner {
private final File localTemp;
private File sdkJar;
@@ -44,11 +44,11 @@
private String deviceRunnerDir = "/sdcard/dalvikrunner";
private List<File> testFiles = new ArrayList<File>();
- private Harness() {
+ private DalvikRunner() {
localTemp = new File("/tmp/" + UUID.randomUUID());
timeoutSeconds = 10 * 60; // default is ten minutes
sdkJar = new File("/home/dalvik-prebuild/android-sdk-linux/platforms/android-2.0/android.jar");
- expectationDirs.add(new File("dalvik/libcore/tools/dalvik_jtreg/expectations"));
+ expectationDirs.add(new File("dalvik/libcore/tools/runner/expectations"));
}
private void prepareLogging() {
@@ -59,7 +59,7 @@
return r.getMessage() + "\n";
}
});
- Logger logger = Logger.getLogger("dalvik.jtreg");
+ Logger logger = Logger.getLogger("dalvik.runner");
logger.addHandler(handler);
logger.setUseParentHandlers(false);
}
@@ -101,7 +101,7 @@
clean = false;
} else if ("--verbose".equals(args[i])) {
- Logger.getLogger("dalvik.jtreg").setLevel(Level.FINE);
+ Logger.getLogger("dalvik.runner").setLevel(Level.FINE);
} else if ("--xml-reports-directory".equals(args[i])) {
xmlReportsDirectory = new File(args[++i]);
@@ -128,10 +128,10 @@
}
private void printUsage() {
- System.out.println("Usage: JTRegRunner [options]... <tests>...");
+ System.out.println("Usage: DalvikRunner [options]... <tests>...");
System.out.println();
System.out.println(" <tests>: a .java file containing a jtreg test, JUnit test,");
- System.out.println(" or a directory of such tests.");
+ System.out.println(" Caliper benchmark, or a directory of such tests.");
System.out.println();
System.out.println("OPTIONS");
System.out.println();
@@ -190,12 +190,12 @@
}
public static void main(String[] args) throws Exception {
- Harness harness = new Harness();
- if (!harness.parseArgs(args)) {
- harness.printUsage();
+ DalvikRunner dalvikRunner = new DalvikRunner();
+ if (!dalvikRunner.parseArgs(args)) {
+ dalvikRunner.printUsage();
return;
}
- harness.prepareLogging();
- harness.run();
+ dalvikRunner.prepareLogging();
+ dalvikRunner.run();
}
}
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/DeviceDalvikVm.java b/libcore/tools/runner/java/dalvik/runner/DeviceDalvikVm.java
similarity index 98%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/DeviceDalvikVm.java
rename to libcore/tools/runner/java/dalvik/runner/DeviceDalvikVm.java
index 7e3207e..87c4605 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/DeviceDalvikVm.java
+++ b/libcore/tools/runner/java/dalvik/runner/DeviceDalvikVm.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.util.logging.Logger;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Driver.java b/libcore/tools/runner/java/dalvik/runner/Driver.java
similarity index 99%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Driver.java
rename to libcore/tools/runner/java/dalvik/runner/Driver.java
index e2516eb..906b8c1 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Driver.java
+++ b/libcore/tools/runner/java/dalvik/runner/Driver.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.util.ArrayList;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Dx.java b/libcore/tools/runner/java/dalvik/runner/Dx.java
similarity index 97%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Dx.java
rename to libcore/tools/runner/java/dalvik/runner/Dx.java
index 16edfa0..83f1265 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Dx.java
+++ b/libcore/tools/runner/java/dalvik/runner/Dx.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
/**
* A dx command.
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/ExpectedResult.java b/libcore/tools/runner/java/dalvik/runner/ExpectedResult.java
similarity index 95%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/ExpectedResult.java
rename to libcore/tools/runner/java/dalvik/runner/ExpectedResult.java
index ad4c776..b732336 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/ExpectedResult.java
+++ b/libcore/tools/runner/java/dalvik/runner/ExpectedResult.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.io.FileInputStream;
@@ -44,8 +44,7 @@
/**
* The expectation of a general successful test run.
*/
- static final ExpectedResult SUCCESS = new ExpectedResult(
- Result.SUCCESS, ".*");
+ static final ExpectedResult SUCCESS = new ExpectedResult(Result.SUCCESS, ".*");
private final Result result;
private final String pattern;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JUnitFinder.java b/libcore/tools/runner/java/dalvik/runner/JUnitFinder.java
similarity index 97%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JUnitFinder.java
rename to libcore/tools/runner/java/dalvik/runner/JUnitFinder.java
index 0f801cc..0d1ad86 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JUnitFinder.java
+++ b/libcore/tools/runner/java/dalvik/runner/JUnitFinder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JUnitRunner.java b/libcore/tools/runner/java/dalvik/runner/JUnitRunner.java
similarity index 98%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JUnitRunner.java
rename to libcore/tools/runner/java/dalvik/runner/JUnitRunner.java
index c3aa854..de5aacd 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JUnitRunner.java
+++ b/libcore/tools/runner/java/dalvik/runner/JUnitRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import junit.framework.Test;
import junit.framework.TestResult;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JavaVm.java b/libcore/tools/runner/java/dalvik/runner/JavaVm.java
similarity index 97%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JavaVm.java
rename to libcore/tools/runner/java/dalvik/runner/JavaVm.java
index 7db0423..6e44d1f 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JavaVm.java
+++ b/libcore/tools/runner/java/dalvik/runner/JavaVm.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Javac.java b/libcore/tools/runner/java/dalvik/runner/Javac.java
similarity index 98%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Javac.java
rename to libcore/tools/runner/java/dalvik/runner/Javac.java
index 179b4d4..26e8bb9 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Javac.java
+++ b/libcore/tools/runner/java/dalvik/runner/Javac.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.util.Arrays;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregFinder.java b/libcore/tools/runner/java/dalvik/runner/JtregFinder.java
similarity index 99%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregFinder.java
rename to libcore/tools/runner/java/dalvik/runner/JtregFinder.java
index 1bbf1f1..1a0e579 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregFinder.java
+++ b/libcore/tools/runner/java/dalvik/runner/JtregFinder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import com.sun.javatest.TestDescription;
import com.sun.javatest.TestResult;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregRunner.java b/libcore/tools/runner/java/dalvik/runner/JtregRunner.java
similarity index 97%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregRunner.java
rename to libcore/tools/runner/java/dalvik/runner/JtregRunner.java
index 10d92ed..450c058 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregRunner.java
+++ b/libcore/tools/runner/java/dalvik/runner/JtregRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.lang.reflect.Method;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Result.java b/libcore/tools/runner/java/dalvik/runner/Result.java
similarity index 91%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Result.java
rename to libcore/tools/runner/java/dalvik/runner/Result.java
index b612407..461f102 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Result.java
+++ b/libcore/tools/runner/java/dalvik/runner/Result.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
/**
- * A test run result.
+ * The result of a test or benchmark execution.
*/
public enum Result {
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Strings.java b/libcore/tools/runner/java/dalvik/runner/Strings.java
similarity index 98%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Strings.java
rename to libcore/tools/runner/java/dalvik/runner/Strings.java
index 4719d08..741af18 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Strings.java
+++ b/libcore/tools/runner/java/dalvik/runner/Strings.java
@@ -15,7 +15,7 @@
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.BufferedReader;
import java.io.File;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestFinder.java b/libcore/tools/runner/java/dalvik/runner/TestFinder.java
similarity index 98%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestFinder.java
rename to libcore/tools/runner/java/dalvik/runner/TestFinder.java
index 9147ddc..e270679 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestFinder.java
+++ b/libcore/tools/runner/java/dalvik/runner/TestFinder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.io.IOException;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestRun.java b/libcore/tools/runner/java/dalvik/runner/TestRun.java
similarity index 99%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestRun.java
rename to libcore/tools/runner/java/dalvik/runner/TestRun.java
index 9da60c6..ab88bac 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestRun.java
+++ b/libcore/tools/runner/java/dalvik/runner/TestRun.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.io.PrintWriter;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestRunner.java b/libcore/tools/runner/java/dalvik/runner/TestRunner.java
similarity index 98%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestRunner.java
rename to libcore/tools/runner/java/dalvik/runner/TestRunner.java
index fce8aa8..93478a7 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/TestRunner.java
+++ b/libcore/tools/runner/java/dalvik/runner/TestRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.IOException;
import java.io.InputStream;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Threads.java b/libcore/tools/runner/java/dalvik/runner/Threads.java
similarity index 97%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Threads.java
rename to libcore/tools/runner/java/dalvik/runner/Threads.java
index 41eef67..58b075b 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Threads.java
+++ b/libcore/tools/runner/java/dalvik/runner/Threads.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Vm.java b/libcore/tools/runner/java/dalvik/runner/Vm.java
similarity index 95%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Vm.java
rename to libcore/tools/runner/java/dalvik/runner/Vm.java
index 8dff81a..25b095c 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/Vm.java
+++ b/libcore/tools/runner/java/dalvik/runner/Vm.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import java.io.File;
import java.io.FileOutputStream;
@@ -38,13 +38,13 @@
*/
public abstract class Vm {
- static final String DALVIK_JTREG_HOME = "dalvik/libcore/tools/dalvik_jtreg";
+ static final String DALVIK_RUNNER_HOME = "dalvik/libcore/tools/runner";
static final Set<File> TEST_RUNNER_JAVA_FILES = new HashSet<File>(Arrays.asList(
- new File(DALVIK_JTREG_HOME + "/java/dalvik/jtreg/CaliperRunner.java"),
- new File(DALVIK_JTREG_HOME + "/java/dalvik/jtreg/JUnitRunner.java"),
- new File(DALVIK_JTREG_HOME + "/java/dalvik/jtreg/JtregRunner.java"),
- new File(DALVIK_JTREG_HOME + "/java/dalvik/jtreg/TestRunner.java")));
+ new File(DALVIK_RUNNER_HOME + "/java/dalvik/runner/CaliperRunner.java"),
+ new File(DALVIK_RUNNER_HOME + "/java/dalvik/runner/JUnitRunner.java"),
+ new File(DALVIK_RUNNER_HOME + "/java/dalvik/runner/JtregRunner.java"),
+ new File(DALVIK_RUNNER_HOME + "/java/dalvik/runner/TestRunner.java")));
private final Pattern JAVA_TEST_PATTERN = Pattern.compile("\\/(\\w)+\\.java$");
static final Classpath COMPILATION_CLASSPATH = Classpath.of(
diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/XmlReportPrinter.java b/libcore/tools/runner/java/dalvik/runner/XmlReportPrinter.java
similarity index 99%
rename from libcore/tools/dalvik_jtreg/java/dalvik/jtreg/XmlReportPrinter.java
rename to libcore/tools/runner/java/dalvik/runner/XmlReportPrinter.java
index 5216f48..9217fc0 100644
--- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/XmlReportPrinter.java
+++ b/libcore/tools/runner/java/dalvik/runner/XmlReportPrinter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package dalvik.jtreg;
+package dalvik.runner;
import org.kxml2.io.KXmlSerializer;
diff --git a/libcore/tools/dalvik_jtreg/lib/javatest.jar b/libcore/tools/runner/lib/javatest.jar
similarity index 100%
rename from libcore/tools/dalvik_jtreg/lib/javatest.jar
rename to libcore/tools/runner/lib/javatest.jar
Binary files differ
diff --git a/libcore/tools/dalvik_jtreg/lib/jh.jar b/libcore/tools/runner/lib/jh.jar
similarity index 100%
rename from libcore/tools/dalvik_jtreg/lib/jh.jar
rename to libcore/tools/runner/lib/jh.jar
Binary files differ
diff --git a/libcore/tools/dalvik_jtreg/lib/jtreg.jar b/libcore/tools/runner/lib/jtreg.jar
similarity index 100%
rename from libcore/tools/dalvik_jtreg/lib/jtreg.jar
rename to libcore/tools/runner/lib/jtreg.jar
Binary files differ
