changeset 174:81c3c189db30

Make the remaining integration tests to run in all BenchmarkMode's.
author shade
date Mon, 02 Sep 2013 19:46:20 +0400
parents f762f75d97c4
children 82b8d82d6b66
files jmh-core-it/src/test/java/org/openjdk/jmh/it/IterationCountAnnTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/WarmupIterationCountAnnTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/WarmupIterationCountCmdTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlDontInlineTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlExcludeTest.java jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlInlineTest.java
diffstat 6 files changed, 18 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/IterationCountAnnTest.java	Mon Sep 02 10:31:24 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/IterationCountAnnTest.java	Mon Sep 02 19:46:20 2013 +0400
@@ -27,9 +27,11 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
+import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
@@ -63,6 +65,7 @@
     }
 
     @GenerateMicroBenchmark
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1, timeUnit = TimeUnit.MILLISECONDS)
     public void test() {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/WarmupIterationCountAnnTest.java	Mon Sep 02 10:31:24 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/WarmupIterationCountAnnTest.java	Mon Sep 02 19:46:20 2013 +0400
@@ -27,9 +27,11 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
+import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
@@ -62,6 +64,7 @@
     }
 
     @GenerateMicroBenchmark
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 3, time = 1)
     @Measurement(iterations = 1, time = 1)
     public void test() {
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/WarmupIterationCountCmdTest.java	Mon Sep 02 10:31:24 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/WarmupIterationCountCmdTest.java	Mon Sep 02 19:46:20 2013 +0400
@@ -27,8 +27,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.openjdk.jmh.Main;
+import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
@@ -61,6 +63,7 @@
     }
 
     @GenerateMicroBenchmark
+    @BenchmarkMode(Mode.All)
     public void test() {
         Fixtures.work();
     }
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlDontInlineTest.java	Mon Sep 02 10:31:24 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlDontInlineTest.java	Mon Sep 02 19:46:20 2013 +0400
@@ -26,9 +26,11 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
+import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.CompilerControl;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.it.Fixtures;
 import org.openjdk.jmh.runner.Runner;
@@ -41,6 +43,7 @@
 public class CompilerControlDontInlineTest {
 
     @GenerateMicroBenchmark
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1, timeUnit = TimeUnit.MILLISECONDS)
     @CompilerControl(CompilerControl.Mode.DONT_INLINE)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlExcludeTest.java	Mon Sep 02 10:31:24 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlExcludeTest.java	Mon Sep 02 19:46:20 2013 +0400
@@ -26,9 +26,11 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
+import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.CompilerControl;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.it.Fixtures;
 import org.openjdk.jmh.runner.Runner;
@@ -41,6 +43,7 @@
 public class CompilerControlExcludeTest {
 
     @GenerateMicroBenchmark
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1, timeUnit = TimeUnit.MILLISECONDS)
     @CompilerControl(CompilerControl.Mode.EXCLUDE)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlInlineTest.java	Mon Sep 02 10:31:24 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/ccontrol/CompilerControlInlineTest.java	Mon Sep 02 19:46:20 2013 +0400
@@ -26,9 +26,11 @@
 
 import org.junit.Test;
 import org.openjdk.jmh.Main;
+import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.CompilerControl;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
 import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.it.Fixtures;
 import org.openjdk.jmh.runner.Runner;
@@ -41,6 +43,7 @@
 public class CompilerControlInlineTest {
 
     @GenerateMicroBenchmark
+    @BenchmarkMode(Mode.All)
     @Warmup(iterations = 0)
     @Measurement(iterations = 1, time = 1, timeUnit = TimeUnit.MILLISECONDS)
     @CompilerControl(CompilerControl.Mode.INLINE)