hg: code-tools/jmh: 7901237: Benchmark list is corrupted when incremental compilation is used

[aleksey.shipilev at oracle.com]

Changeset: 6c93505a6763
Author:    shade
Date:      2015-01-12 22:07 +0300
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/6c93505a6763

7901237: Benchmark list is corrupted when incremental compilation is used
Summary: Merge benchmark entries during the benchmark generation.

! jmh-core-ct/src/test/java/org/openjdk/jmh/ct/CompileTest.java
+ jmh-core-ct/src/test/java/org/openjdk/jmh/ct/InMemoryGeneratorDestination.java
+ jmh-core-ct/src/test/java/org/openjdk/jmh/ct/multsession/Benchmark1.java
+ jmh-core-ct/src/test/java/org/openjdk/jmh/ct/multsession/Benchmark2.java
+ jmh-core-ct/src/test/java/org/openjdk/jmh/ct/multsession/MultipleSessionsTest.java
! jmh-core/src/main/java/org/openjdk/jmh/generators/core/BenchmarkGenerator.java
! jmh-core/src/main/java/org/openjdk/jmh/generators/core/FileSystemDestination.java
! jmh-core/src/main/java/org/openjdk/jmh/generators/core/GeneratorDestination.java
+ jmh-core/src/main/java/org/openjdk/jmh/generators/core/SourceElementWarning.java
+ jmh-core/src/main/java/org/openjdk/jmh/generators/core/SourceThrowableWarning.java
+ jmh-core/src/main/java/org/openjdk/jmh/generators/core/SourceWarning.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/BenchmarkListEntry.java
! jmh-core/src/main/java/org/openjdk/jmh/runner/WorkloadParams.java
! jmh-core/src/main/java/org/openjdk/jmh/util/FileUtils.java
! jmh-generator-annprocess/src/main/java/org/openjdk/jmh/generators/annotations/APGeneratorDestinaton.java