diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2008-04-29 15:46:28 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2008-04-29 15:46:28 +0000 |
| commit | 9af5aa94d336f85bd27b286967551f75519a3486 (patch) | |
| tree | 4e09e8c9ae2d2fc179c3ccdfbbe2ccdcd089b7a7 /test/files/jvm/inner.scala | |
| parent | 006394362f79dd5dc6c39cd793db488767ae0027 (diff) | |
| download | scala-9af5aa94d336f85bd27b286967551f75519a3486.tar.gz scala-9af5aa94d336f85bd27b286967551f75519a3486.tar.bz2 scala-9af5aa94d336f85bd27b286967551f75519a3486.zip | |
Fixed jvm/inner test to work on a Java distribu...
Fixed jvm/inner test to work on a Java distribution where jre and sdk
bin folders are separate.
Diffstat (limited to 'test/files/jvm/inner.scala')
| -rw-r--r-- | test/files/jvm/inner.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/files/jvm/inner.scala b/test/files/jvm/inner.scala index 4e990076f2..612228028c 100644 --- a/test/files/jvm/inner.scala +++ b/test/files/jvm/inner.scala @@ -55,8 +55,9 @@ object Scalatest { private val outputdir = System.getProperty("scalatest.output", "inner-jvm.obj") private val scalalib = System.getProperty("scalatest.lib", "") private val classpath = outputdir + File.pathSeparator + scalalib - private val javacmd = System.getProperty("javacmd", "java") - private val javac = javacmd + "c" + private val javahome = System.getProperty("java.home") + private val javacmd = javahome + File.separator + "bin" + File.separator + "java" + private val javac = javahome + File.separator + "bin" + File.separator + "javac" def javac(src: String, fname: String) { val tmpfilename = outputdir + File.separator + fname |