diff options
| author | Pap Lőrinc <paplorinc@gmail.com> | 2016-11-15 17:13:41 +0200 |
|---|---|---|
| committer | Pap Lőrinc <paplorinc@gmail.com> | 2016-11-18 12:48:59 +0200 |
| commit | e9303d9757a963ad73140bbb303b64e5c69d1a17 (patch) | |
| tree | 7c6ef079d814389b88e27e6f9b806b14a14aa694 | |
| parent | 40f8df19ced57637a795c705080e528d82303248 (diff) | |
| download | scala-e9303d9757a963ad73140bbb303b64e5c69d1a17.tar.gz scala-e9303d9757a963ad73140bbb303b64e5c69d1a17.tar.bz2 scala-e9303d9757a963ad73140bbb303b64e5c69d1a17.zip | |
Updated benchmark dependencies
| -rw-r--r-- | test/benchmarks/README.md | 7 | ||||
| -rw-r--r-- | test/benchmarks/build.sbt | 4 | ||||
| -rw-r--r-- | test/benchmarks/project/plugins.sbt | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/test/benchmarks/README.md b/test/benchmarks/README.md index 370d610bc4..6c77b83605 100644 --- a/test/benchmarks/README.md +++ b/test/benchmarks/README.md @@ -5,9 +5,7 @@ that makes use of the [SBT plugin](https://github.com/ktoso/sbt-jmh) for [JMH](h ## Running a benchmark -The benchmarks require first building Scala into `../../build/pack` with `ant`. -If you want to build with `sbt dist/mkPack` instead, -you'll need to change `scalaHome` in this project. +The benchmarks require first building Scala into `../../build/pack`. You'll then need to know the fully-qualified name of the benchmark runner class. The benchmarking classes are organized under `src/main/scala`, @@ -18,8 +16,7 @@ Using this example, one would simply run jmh:runMain scala.collection.mutable.OpenHashMapRunner -in SBT. -SBT should be run _from this directory_. +in SBT, run _from this directory_ (`test/benchmarks`). The JMH results can be found under `target/jmh-results/`. `target` gets deleted on an SBT `clean`, diff --git a/test/benchmarks/build.sbt b/test/benchmarks/build.sbt index fb05fb2c99..ef603e18b3 100644 --- a/test/benchmarks/build.sbt +++ b/test/benchmarks/build.sbt @@ -1,5 +1,5 @@ scalaHome := Some(file("../../build/pack")) -scalaVersion := "2.12.0-dev" +scalaVersion := "2.12.1-dev" scalacOptions ++= Seq("-feature", "-opt:l:classpath") lazy val root = (project in file(".")). @@ -7,5 +7,5 @@ lazy val root = (project in file(".")). settings( name := "test-benchmarks", version := "0.0.1", - libraryDependencies += "org.openjdk.jol" % "jol-core" % "0.4" + libraryDependencies += "org.openjdk.jol" % "jol-core" % "0.6" ) diff --git a/test/benchmarks/project/plugins.sbt b/test/benchmarks/project/plugins.sbt index aa49ad9872..1b79ce888c 100644 --- a/test/benchmarks/project/plugins.sbt +++ b/test/benchmarks/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") -addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.16") +addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.17") |