diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2010-11-13 19:18:30 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2010-11-13 19:18:30 +0000 |
| commit | 5d1052f36a889607eb365c37450bb9b5c7862d9e (patch) | |
| tree | 2e35a5340d316c79f5f67e368a23bcc4f6c016f8 /test | |
| parent | d205bf404fb361de6c8829d8f13d8adcc809e87d (diff) | |
| download | scala-5d1052f36a889607eb365c37450bb9b5c7862d9e.tar.gz scala-5d1052f36a889607eb365c37450bb9b5c7862d9e.tar.bz2 scala-5d1052f36a889607eb365c37450bb9b5c7862d9e.zip | |
Use partest's java and javac command in the jav...
Use partest's java and javac command in the javasigs test. no review.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/jvm/javasigs.scala | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/test/files/jvm/javasigs.scala b/test/files/jvm/javasigs.scala index f2ac8b6ad1..937b46d1d4 100644 --- a/test/files/jvm/javasigs.scala +++ b/test/files/jvm/javasigs.scala @@ -4,15 +4,8 @@ object Scalatest { val outputdir = System.getProperty("partest.output", "inner.obj") val scalalib = System.getProperty("partest.lib", "") val classpath = outputdir + File.pathSeparator + scalalib - val javabin = { - val jhome = new File(System.getProperty("java.home")) - if (jhome.getName == "jre") - new File(jhome.getParent, "bin").getAbsolutePath - else - new File(jhome, "bin").getAbsolutePath - } - val javacmd = javabin + File.separator + "java" - val javac = javabin + File.separator + "javac" + val javacmd = System.getProperty("javacmd", "java") + val javac = javacmd + "c" def javac(src: String, opts: String, fname: String) { val tmpfilename = outputdir + File.separator + fname |