diff options
Diffstat (limited to 'integration/test/resources/play-json/jmh.sc')
-rw-r--r-- | integration/test/resources/play-json/jmh.sc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/integration/test/resources/play-json/jmh.sc b/integration/test/resources/play-json/jmh.sc index 76ed43fc..d67e14d1 100644 --- a/integration/test/resources/play-json/jmh.sc +++ b/integration/test/resources/play-json/jmh.sc @@ -1,4 +1,4 @@ -import ammonite.ops._ + import mill._, scalalib._, modules._ trait Jmh extends ScalaModule { @@ -7,7 +7,7 @@ trait Jmh extends ScalaModule { def runJmh(args: String*) = T.command { val (_, resources) = generateBenchmarkSources() - Jvm.interactiveSubprocess( + Jvm.runSubprocess( "org.openjdk.jmh.Main", classPath = (runClasspath() ++ generatorDeps()).map(_.path) ++ Seq(compileGeneratedSources().path, resources), @@ -19,13 +19,13 @@ trait Jmh extends ScalaModule { def compileGeneratedSources = T { val dest = T.ctx.dest val (sourcesDir, _) = generateBenchmarkSources() - val sources = ls.rec(sourcesDir).filter(_.isFile) - %%("javac", + val sources = os.walk(sourcesDir).filter(os.isFile) + os.proc("javac", sources.map(_.toString), "-cp", (runClasspath() ++ generatorDeps()).map(_.path.toString).mkString(":"), "-d", - dest)(wd = dest) + dest).call(dest) PathRef(dest) } @@ -36,12 +36,12 @@ trait Jmh extends ScalaModule { val sourcesDir = dest / 'jmh_sources val resourcesDir = dest / 'jmh_resources - rm(sourcesDir) - mkdir(sourcesDir) - rm(resourcesDir) - mkdir(resourcesDir) + os.remove.all(sourcesDir) + os.makeDir.all(sourcesDir) + os.remove.all(resourcesDir) + os.makeDir.all(resourcesDir) - Jvm.subprocess( + Jvm.runSubprocess( "org.openjdk.jmh.generators.bytecode.JmhBytecodeGenerator", (runClasspath() ++ generatorDeps()).map(_.path), mainArgs = Array( |