Skip to content

Commit 12d0255

Browse files
authored
Make clean task recognize test coordinates (#677)
1 parent 666d367 commit 12d0255

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ import org.graalvm.internal.tck.ConfigFilesChecker
1616
import org.graalvm.internal.tck.ScaffoldTask
1717
import org.graalvm.internal.tck.GrypeTask
1818
import org.graalvm.internal.tck.TestedVersionUpdaterTask
19+
import org.graalvm.internal.tck.harness.tasks.TestInvocationTask
1920
import org.graalvm.internal.tck.harness.tasks.CheckstyleInvocationTask
21+
import org.graalvm.internal.tck.harness.tasks.CleanInvocationTask
2022
import org.graalvm.internal.tck.updaters.FetchExistingLibrariesWithNewerVersionsTask
2123
import org.graalvm.internal.tck.updaters.GroupUnsupportedLibraries
22-
import org.graalvm.internal.tck.harness.tasks.TestInvocationTask
2324

2425

2526
import static org.graalvm.internal.tck.Utils.generateTaskName
@@ -63,6 +64,14 @@ for (String coordinates in matchingCoordinates) {
6364
checkstyle.configure {
6465
dependsOn(checkstyleTaskName)
6566
}
67+
68+
String cleanTaskName = generateTaskName("clean", coordinates)
69+
if ((!tasks.getNames().contains(cleanTaskName))) {
70+
tasks.register(cleanTaskName, CleanInvocationTask, coordinates)
71+
}
72+
clean.configure {
73+
dependsOn(cleanTaskName)
74+
}
6675
}
6776

6877
// gradle diff -PbaseCommit=<base-commit> -PnewCommit=<new-commit>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.graalvm.internal.tck.harness.tasks
2+
3+
import org.gradle.api.tasks.Input
4+
5+
import javax.inject.Inject
6+
7+
abstract class CleanInvocationTask extends AbstractSubprojectTask {
8+
9+
@Inject
10+
CleanInvocationTask(String coordinates) {
11+
super(coordinates)
12+
}
13+
14+
@Override
15+
@Input
16+
List<String> getCommand() {
17+
return [tckExtension.repoRoot.get().asFile.toPath().resolve("gradlew").toString(), "clean"]
18+
}
19+
20+
@Override
21+
protected String getErrorMessage(int exitCode) {
22+
"Clean task failed"
23+
}
24+
25+
}

0 commit comments

Comments
 (0)