File tree Expand file tree Collapse file tree 3 files changed +8
-13
lines changed
dd-java-agent/instrumentation/java-concurrent/src/test/groovy
dd-smoke-tests/log-injection Expand file tree Collapse file tree 3 files changed +8
-13
lines changed Original file line number Diff line number Diff line change @@ -77,4 +77,4 @@ class QueueTimingForkedTest extends AgentTestRunner {
77
77
@Override
78
78
void run () {}
79
79
}
80
- }
80
+ }
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ plugins {
7
7
apply from : " $rootDir /gradle/java.gradle"
8
8
description = ' Log injection Smoke Tests.'
9
9
10
+ // Java 24 requires at least groovy v3.0.24
10
11
configurations. all {
11
12
resolutionStrategy {
12
13
force ' org.codehaus.groovy:groovy-all:3.0.24'
Original file line number Diff line number Diff line change @@ -151,20 +151,14 @@ project.afterEvaluate {
151
151
def testJvm = gradle. startParameter. projectProperties[" testJvm" ]
152
152
def javaTestLauncher = null as Provider<JavaLauncher >
153
153
if (testJvm == " stable" ) {
154
- def javaHomeVersions = System . getenv(). findAll { it. key =~ / ^JAVA_[0-9]+_HOME$/ }
155
- if (javaHomeVersions. isEmpty()) {
156
- throw new GradleException (" No JAVA_X_HOME environment variables found." )
157
- }
158
- def javaVersions = javaHomeVersions. keySet(). collect { key ->
159
- def matcher = key =~ / JAVA_([0-9]+)_HOME/
160
- if (! matcher. matches()) {
161
- return null
162
- }
163
- matcher. group(1 ) as Integer
164
- }. findAll { it != null }
154
+ def javaVersions = System . getenv()
155
+ .findAll { it. key =~ / ^JAVA_[0-9]+_HOME$/ }
156
+ .collect { (it. key =~ / ^JAVA_(\d +)_HOME$/ )[0 ][1 ] as Integer }
157
+
165
158
if (javaVersions. isEmpty()) {
166
- throw new GradleException (" No Java versions found from JAVA_X_HOME environment variables." )
159
+ throw new GradleException (" No valid JAVA_X_HOME environment variables found ." )
167
160
}
161
+
168
162
testJvm = javaVersions. max(). toString()
169
163
}
170
164
if (testJvm) {
You can’t perform that action at this time.
0 commit comments