Skip to content

Commit 03ceb9c

Browse files
committed
Merge branch 'eyalroth-fix-cross-version-test'
2 parents 23caa3c + 0f324a2 commit 03ceb9c

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

build.gradle

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,29 @@ sourceSets {
6464
}
6565
}
6666

67-
task functionalTest(type: Test) {
68-
description = 'Runs the functional tests.'
67+
task crossScalaVersionFunctionalTest(type: Test) {
68+
description = 'Runs the cross scala version functional test.'
6969
group = 'verification'
7070
testClassesDirs = sourceSets.functionalTest.output.classesDirs
7171
classpath = sourceSets.functionalTest.runtimeClasspath
72+
include "**/ScalaMultiModuleCrossVersionTest.*"
7273

7374
testLogging.showStandardStreams = true
7475

7576
mustRunAfter test
7677
}
7778

79+
task functionalTest(type: Test) {
80+
description = 'Runs the functional tests.'
81+
group = 'verification'
82+
testClassesDirs = sourceSets.functionalTest.output.classesDirs
83+
classpath = sourceSets.functionalTest.runtimeClasspath
84+
exclude "**/ScalaMultiModuleCrossVersionTest.*"
85+
86+
testLogging.showStandardStreams = true
87+
88+
dependsOn crossScalaVersionFunctionalTest
89+
}
7890
check.dependsOn functionalTest
7991

8092
gradlePlugin {

0 commit comments

Comments
 (0)