commit 6ce558b97f80d4ef7be2ef43333101d1aac7dcbf
author TDYa127 <tdy@google.com> Wed Apr 11 11:17:55 2012 -0700
committer Shih-wei Liao <sliao@google.com> Wed Apr 11 12:06:12 2012 -0700
tree 5cb9dcfad020f44373bde81e716e153cd3cb574c
parent 548250302e93570e2e65ac63b88bda7b39c8dc01

Fix the hardcoded path.

Change-Id: I13f47555966e9d48703f14e3e9a80e2d9af80c2b

test/063-process-manager/src/Main.java

diff --git a/test/063-process-manager/src/Main.java b/test/063-process-manager/src/Main.java
index c94b8ad..68bf878 100644
--- a/test/063-process-manager/src/Main.java
+++ b/test/063-process-manager/src/Main.java
@@ -14,7 +14,7 @@
 
     static private void child() throws Exception {
         System.out.println("spawning child");
-        ProcessBuilder pb = new ProcessBuilder("/system/bin/sleep", "5");
+        ProcessBuilder pb = new ProcessBuilder("sleep", "5");
         Process proc = pb.start();
         Thread.sleep(1000);
         checkManager();

test/068-classloader/src/FancyLoader.java

diff --git a/test/068-classloader/src/FancyLoader.java b/test/068-classloader/src/FancyLoader.java
index 44f335b..6a153cc 100644
--- a/test/068-classloader/src/FancyLoader.java
+++ b/test/068-classloader/src/FancyLoader.java
@@ -38,7 +38,7 @@
     static final String CLASS_PATH = "classes-ex/";
 
     /* this is the "alternate" DEX/Jar file */
-    static final String DEX_FILE = "/data/run-test/068-classloader-ex.jar";
+    static final String DEX_FILE = System.getenv("DEX_LOCATION") + "/068-classloader-ex.jar";
 
     /* on Dalvik, this is a DexFile; otherwise, it's null */
     private Class mDexClass;

test/071-dexfile/src/Main.java

diff --git a/test/071-dexfile/src/Main.java b/test/071-dexfile/src/Main.java
index 1fc84e5..117a391 100644
--- a/test/071-dexfile/src/Main.java
+++ b/test/071-dexfile/src/Main.java
@@ -22,8 +22,8 @@
  * DexFile tests (Dalvik-specific).
  */
 public class Main {
-    private static final String CLASS_PATH = "/data/run-test/071-dexfile-ex.jar";
-    private static final String ODEX_DIR = "/data/run-test";
+    private static final String CLASS_PATH = System.getenv("DEX_LOCATION") + "/071-dexfile-ex.jar";
+    private static final String ODEX_DIR = System.getenv("DEX_LOCATION");
     //private static final String ODEX_DIR = ".";
     private static final String ODEX_ALT = "/tmp";
     private static final String LIB_DIR = "/nowhere/nothing/";

test/086-null-super/src/Main.java

diff --git a/test/086-null-super/src/Main.java b/test/086-null-super/src/Main.java
index 2a15b9e..060737f 100644
--- a/test/086-null-super/src/Main.java
+++ b/test/086-null-super/src/Main.java
@@ -55,7 +55,7 @@
         private static final String CLASS_NAME =
                 "Main$BrokenDexLoader$Inaccessible";
 
-        private static final String DEX_FILE = "/data/run-test/086-null-super.jar";
+        private static final String DEX_FILE = System.getenv("DEX_LOCATION") + "/086-null-super.jar";
 
         public BrokenDexLoader(ClassLoader parent) {
             super(parent);

test/087-gc-after-link/src/Main.java

diff --git a/test/087-gc-after-link/src/Main.java b/test/087-gc-after-link/src/Main.java
index ca259f9..c99a7d5 100644
--- a/test/087-gc-after-link/src/Main.java
+++ b/test/087-gc-after-link/src/Main.java
@@ -55,7 +55,7 @@
         private static final String CLASS_NAME =
                 "Main$BrokenDexLoader$Inaccessible";
 
-        private static final String DEX_FILE = "/data/run-test/087-gc-after-link.jar";
+        private static final String DEX_FILE = System.getenv("DEX_LOCATION") + "/087-gc-after-link.jar";
 
         public BrokenDexLoader(ClassLoader parent) {
             super(parent);

test/etc/push-and-run-test-jar

diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar
index e38c0cf..c892309 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -116,7 +116,7 @@
   #   jdb -attach localhost:12345
 fi
 
-cmdline="cd /data; $INVOKE_WITH $OATEXEC $DEX_DEBUG $ZYGOTE -Xjnigreflimit:256 \
+cmdline="cd /data; export DEX_LOCATION=$DEX_LOCATION; $INVOKE_WITH $OATEXEC $DEX_DEBUG $ZYGOTE -Xjnigreflimit:256 \
     -Ximage:/data/art-test/core.art \
     -cp /data/run-test/$TEST_NAME.jar \
     Main"