equal
deleted
inserted
replaced
57 return ":".join(classpathents) |
57 return ":".join(classpathents) |
58 |
58 |
59 def run_common(self, dir, jargs, pargs): |
59 def run_common(self, dir, jargs, pargs): |
60 root = os.getenv("ROOT") |
60 root = os.getenv("ROOT") |
61 classpath = self.make_classpath(root, dir) |
61 classpath = self.make_classpath(root, dir) |
|
62 javacmd = os.getenv("JAVA_HOME", "/usr") + "/bin/java" |
62 |
63 |
63 args = ["java", "-classpath", classpath, "testutil.TestExec"] |
64 args = [javacmd, "-classpath", classpath, "testutil.TestExec"] |
64 args.extend(jargs) |
65 args.extend(jargs) |
65 args.extend(self.findtests(dir)) |
66 args.extend(self.findtests(dir)) |
66 |
67 |
67 myenv = os.environ.copy() |
68 myenv = os.environ.copy() |
68 proc = fw.with_proto_libs(myenv, root, |
69 proc = fw.with_proto_libs(myenv, root, |