You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2026/02/18 06:55:11 UTC
(groovy) 02/02: fix jmh tests (further fixes)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 116ba66958d41ab226e00f16412e3e28c081086b
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Feb 18 16:54:58 2026 +1000
fix jmh tests (further fixes)
---
.github/workflows/groovy-jmh-bench-classic.yml | 2 +-
.github/workflows/groovy-jmh-bench.yml | 2 +-
.github/workflows/groovy-jmh-perf-classic.yml | 2 +-
.github/workflows/groovy-jmh-perf.yml | 2 +-
build-logic/src/main/groovy/org.apache.groovy-performance.gradle | 5 ++++-
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/groovy-jmh-bench-classic.yml b/.github/workflows/groovy-jmh-bench-classic.yml
index b8c4366511..fc9b43580a 100644
--- a/.github/workflows/groovy-jmh-bench-classic.yml
+++ b/.github/workflows/groovy-jmh-bench-classic.yml
@@ -36,7 +36,7 @@ jobs:
check-latest: true
- uses: gradle/actions/setup-gradle@v5
- name: Benchmarks (bench classic)
- run: ./gradlew perf:jmh -PbenchInclude=\\.bench\\. -Pindy=false
+ run: ./gradlew perf:displayJmhResults -PbenchInclude=\\.bench\\. -Pindy=false
timeout-minutes: 60
- name: Upload reports-jmh-bench-classic
uses: actions/upload-artifact@v6
diff --git a/.github/workflows/groovy-jmh-bench.yml b/.github/workflows/groovy-jmh-bench.yml
index 849c8cdf57..4cf9fff362 100644
--- a/.github/workflows/groovy-jmh-bench.yml
+++ b/.github/workflows/groovy-jmh-bench.yml
@@ -36,7 +36,7 @@ jobs:
check-latest: true
- uses: gradle/actions/setup-gradle@v5
- name: Benchmarks (bench)
- run: ./gradlew perf:jmh -PbenchInclude=\\.bench\\.
+ run: ./gradlew perf:displayJmhResults -PbenchInclude=\\.bench\\.
timeout-minutes: 60
- name: Upload reports-jmh-bench
uses: actions/upload-artifact@v6
diff --git a/.github/workflows/groovy-jmh-perf-classic.yml b/.github/workflows/groovy-jmh-perf-classic.yml
index d3f7d7159f..df3f96b3df 100644
--- a/.github/workflows/groovy-jmh-perf-classic.yml
+++ b/.github/workflows/groovy-jmh-perf-classic.yml
@@ -36,7 +36,7 @@ jobs:
check-latest: true
- uses: gradle/actions/setup-gradle@v5
- name: Benchmarks (perf classic)
- run: ./gradlew perf:jmh -PbenchInclude=\\.perf\\. -Pindy=false
+ run: ./gradlew perf:displayJmhResults -PbenchInclude=\\.perf\\. -Pindy=false
timeout-minutes: 60
- name: Upload reports-jmh-perf-classic
uses: actions/upload-artifact@v6
diff --git a/.github/workflows/groovy-jmh-perf.yml b/.github/workflows/groovy-jmh-perf.yml
index 359535509b..0acb141e38 100644
--- a/.github/workflows/groovy-jmh-perf.yml
+++ b/.github/workflows/groovy-jmh-perf.yml
@@ -36,7 +36,7 @@ jobs:
check-latest: true
- uses: gradle/actions/setup-gradle@v5
- name: Benchmarks (perf)
- run: ./gradlew perf:jmh -PbenchInclude=\\.perf\\.
+ run: ./gradlew perf:displayJmhResults -PbenchInclude=\\.perf\\.
timeout-minutes: 60
- name: Upload reports-jmh-perf
uses: actions/upload-artifact@v6
diff --git a/build-logic/src/main/groovy/org.apache.groovy-performance.gradle b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
index f7ee36eb52..eddbc12f16 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
@@ -68,8 +68,12 @@ tasks.named('jmhClasses') {
dependsOn tasks.named('clean')
}
+var indy = (project.findProperty('indy') ?: 'true').toBoolean()
+
tasks.named('compileJmhGroovy') {
classpath += compileJmhJava.classpath
+ groovyOptions.optimizationOptions.indy = indy
+ inputs.property('indy', indy)
}
tasks.register('displayJmhResults') {
@@ -90,7 +94,6 @@ tasks.named('test') {
tasks.named('jmh') {
inputs.property('benchInclude', project.findProperty('benchInclude') ?: '')
- inputs.property('indy', project.findProperty('indy') ?: '')
dependsOn tasks.named('jmhClasses')
}