From 233a8609bbecdb92c7df0c9cbd3de5cd71c5dba7 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Mon, 16 Nov 2009 14:22:02 -0800 Subject: [PATCH] Specifying the /tmp directory and other properties for test runs. This fixes 2 broken tests in RandomAccessFile, and possibly others. --- libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregRunner.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregRunner.java b/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregRunner.java index 1f8247eb5..246d2d87b 100644 --- a/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregRunner.java +++ b/libcore/tools/dalvik_jtreg/java/dalvik/jtreg/JtregRunner.java @@ -49,6 +49,7 @@ public final class JtregRunner { private final File localTemp = new File("/tmp/" + UUID.randomUUID()); private final File deviceTemp = new File("/data/jtreg" + UUID.randomUUID()); + private final File testTemp = new File(deviceTemp, "/tests.tmp"); private final Adb adb = new Adb(); private final File directoryToScan; @@ -132,6 +133,7 @@ public final class JtregRunner { */ private void prepareDevice() { adb.mkdir(deviceTemp); + adb.mkdir(testTemp); File testRunnerJar = testToDex.writeTestRunnerJar(); adb.push(testRunnerJar, deviceTemp); deviceTestRunner = new File(deviceTemp, testRunnerJar.getName()); @@ -187,6 +189,11 @@ public final class JtregRunner { builder.args("adb", "shell", "dalvikvm"); builder.args("-classpath", Command.path(testRun.getDeviceDex(), deviceTestRunner)); builder.args("-Duser.dir=" + testRun.getBase()); + builder.args("-Duser.name=root"); + builder.args("-Duser.language=en"); + builder.args("-Duser.region=US"); + builder.args("-Djavax.net.ssl.trustStore=/system/etc/security/cacerts.bks"); + builder.args("-Djava.io.tmpdir=" + testTemp); if (debugPort != null) { builder.args("-Xrunjdwp:transport=dt_socket,address=" + debugPort + ",server=y,suspend=y"); -- 2.11.0