Skip to content

Commit cf7c685

Browse files
Aleksandar Gradinacgradinac
authored andcommitted
Allow overriding the test toolchain search path
1 parent 82027cd commit cf7c685

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

tests/tck-build-logic/src/main/groovy/org/graalvm/internal/tck/harness/tasks/TestInvocationTask.groovy

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
package org.graalvm.internal.tck.harness.tasks
99

10-
10+
import org.gradle.api.provider.ProviderFactory
1111
import org.gradle.api.tasks.Input
1212

1313
import javax.inject.Inject
@@ -35,6 +35,9 @@ abstract class TestInvocationTask extends AbstractSubprojectTask {
3535
this.coordinates = coordinates
3636
}
3737

38+
@Inject
39+
abstract ProviderFactory getProviders();
40+
3841
/**
3942
* Fetches arguments for test invocation from index.json file (if present).
4043
* @param coordinates
@@ -44,6 +47,15 @@ abstract class TestInvocationTask extends AbstractSubprojectTask {
4447
@Input
4548
List<String> getCommand() {
4649
def defaultArgs = [tckExtension.repoRoot.get().asFile.toPath().resolve("gradlew").toString(), "nativeTest"]
50+
def installPathsProperty = providers.environmentVariable("TCK_JDK_INSTALLATION_PATHS")
51+
if (installPathsProperty.isPresent()) {
52+
defaultArgs.addAll(
53+
[
54+
"-Porg.gradle.java.installations.auto-detect=false",
55+
"-Porg.gradle.java.installations.paths=${installPathsProperty.get()}"
56+
]
57+
)
58+
}
4759
try {
4860
Map<String, List<String>> testIndex = readIndexFile(tckExtension.getTestDir(coordinates)) as Map<String, List<String>>
4961
if (!testIndex.containsKey("test-command")) {

0 commit comments

Comments
 (0)