Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

When building JMH benchmarks, fail on error, instead of proceeding. #977

Merged
merged 5 commits into from
Feb 3, 2020
Merged

When building JMH benchmarks, fail on error, instead of proceeding. #977

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
929b318
When building JMH benchmarks, fail on error, instead of proceeding.
SamirTalwar Jan 30, 2020
c457d3a
Add a test for expected failures in JMH benchmarks.
SamirTalwar Jan 31, 2020
2287da0
Document the fix to JMH builds as a breaking change.
SamirTalwar Jan 31, 2020
a75c817
Split "test_benchmark_jmh_failure" from "test_benchmark_jmh".
SamirTalwar Feb 3, 2020
fb30460
We don't need ValidBenchmark.scala when testing JMH failures.
SamirTalwar Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions src/scala/io/bazel/rules_scala/jmh_support/BenchmarkGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,24 @@ object BenchmarkGenerator {
classPath: List[Path]
)

private case class GenerationException(messageLines: Seq[String])
extends RuntimeException(messageLines.mkString("\n"))

def main(argv: Array[String]): Unit = {
val args = parseArgs(argv)
generateJmhBenchmark(
args.generatorType,
args.resultSourceJar,
args.resultResourceJar,
args.inputJar,
args.classPath
)
try {
generateJmhBenchmark(
args.generatorType,
args.resultSourceJar,
args.resultResourceJar,
args.inputJar,
args.classPath
)
} catch {
case GenerationException(messageLines) =>
ittaiz marked this conversation as resolved.
Show resolved Hide resolved
messageLines.foreach(log)
sys.exit(1)
}
}

private def parseArgs(argv: Array[String]): BenchmarkGeneratorArgs = {
Expand Down Expand Up @@ -168,10 +177,8 @@ object BenchmarkGenerator {
generator.generate(source, destination)
generator.complete(source, destination)
if (destination.hasErrors) {
log("JMH Benchmark generator failed")
for (e <- destination.getErrors.asScala) {
log(e.toString)
}
throw new GenerationException(
"JHM Benchmark generator failed" +: destination.getErrors.asScala.map(_.toString).toSeq)
}
}
constructJar(sourceJarOut, tmpSourceDir)
Expand Down