diff options
| -rw-r--r-- | src/library/scala/util/Properties.scala | 3 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Runner.scala | 3 | ||||
| -rw-r--r-- | test/files/run/t5313.scala | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index 2240dde360..fef9cef246 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -146,6 +146,9 @@ private[scala] trait PropertiesTrait { /** Returns `true` iff the underlying operating system is a version of Apple Mac OSX. */ def isMac = osName startsWith "Mac OS X" + /* Some runtime values. */ + private[scala] def isAvian = javaVmName contains "Avian" + // This is looking for javac, tools.jar, etc. // Tries JDK_HOME first, then the more common but likely jre JAVA_HOME, // and finally the system property based javaHome. diff --git a/src/partest/scala/tools/partest/nest/Runner.scala b/src/partest/scala/tools/partest/nest/Runner.scala index 1034d724d2..a53698eb77 100644 --- a/src/partest/scala/tools/partest/nest/Runner.scala +++ b/src/partest/scala/tools/partest/nest/Runner.scala @@ -286,7 +286,7 @@ class Runner(val testFile: File, fileManager: FileManager, val testRunParams: Te * might be failing, in the normal case. */ def diffilter(d: String) = { - import scala.util.Properties.javaVersion + import scala.util.Properties.{javaVersion, isAvian} val prefix = "#partest" val margin = "> " val leader = margin + prefix @@ -297,6 +297,7 @@ class Runner(val testFile: File, fileManager: FileManager, val testRunParams: Te val cond = token match { case "java7" => javaVersion startsWith "1.7" case "java6" => javaVersion startsWith "1.6" + case "avian" => isAvian case "true" => true case _ => false } diff --git a/test/files/run/t5313.scala b/test/files/run/t5313.scala index 7da8726a1f..febfd9c3ed 100644 --- a/test/files/run/t5313.scala +++ b/test/files/run/t5313.scala @@ -7,7 +7,7 @@ object Test extends IcodeTest { override def code = """class Foo { - def randomBoolean = util.Random.nextInt % 2 == 0 + def randomBoolean = scala.util.Random.nextInt % 2 == 0 def bar = { var kept1 = new Object val result = new java.lang.ref.WeakReference(kept1) |