AI 143383: am: CL 143233 am: CL 143070 Two small fixes for the support module. The

  classloader factory didn't work, since the
  innerhalb classes had to be static. Plus
  we don't want to see System.out stuff in the
  tests.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143383

2 files changed, 4 insertions, 11 deletions

diff --git a/support/src/test/java/tests/support/Support_ClassLoader.java b/support/src/test/java/tests/support/Support_ClassLoader.java
index 12bbdf3..b442e60 100644
--- a/support/src/test/java/tests/support/Support_ClassLoader.java
+++ b/support/src/test/java/tests/support/Support_ClassLoader.java
@@ -47,13 +47,13 @@ public abstract class Support_ClassLoader {
         }
     }
     
-    class Dalvik extends Support_ClassLoader {
+    static class Dalvik extends Support_ClassLoader {
         public ClassLoader getClassLoader(URL url, ClassLoader parent) {
             return new PathClassLoader(url.getPath(), parent);
         }
     }
     
-    class RefImpl extends Support_ClassLoader {
+    static class RefImpl extends Support_ClassLoader {
         public ClassLoader getClassLoader(URL url, ClassLoader parent) {
             return new URLClassLoader(new URL[] { url }, parent);
         }
diff --git a/support/src/test/java/tests/support/Support_Exec.java b/support/src/test/java/tests/support/Support_Exec.java
index eb55d67..c3a5ccc 100644
--- a/support/src/test/java/tests/support/Support_Exec.java
+++ b/support/src/test/java/tests/support/Support_Exec.java
@@ -110,15 +110,10 @@ public class Support_Exec extends TestCase {
         execArgs = new ArrayList<String>(3 + args.length);
 
         // construct the name of executable file
-        executable = System.getProperty("java.home");
-        if (!executable.endsWith(File.separator)) {
-            executable += File.separator;
-        }
-        executable += "bin" + File.separator;
         if (againstDalvik) {
-            execArgs.add(executable + "dalvikvm");
+            execArgs.add("dalvikvm");
         } else {
-            execArgs.add(executable + "java");
+            execArgs.add("java");
         }
 
         // add classpath string
@@ -161,8 +156,6 @@ public class Support_Exec extends TestCase {
                 command.append(" ");
                 command.append(execArgs.get(i));
             }
-            System.out.println();
-            System.out.println("Exec: " + command.toString());
         }
 
         // execute java process