File tree Expand file tree Collapse file tree
functionalTest/kotlin/org/checkerframework/plugin/gradle
main/kotlin/org/checkerframework/plugin/gradle Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ class CFGroovyPluginFunctionalTest : GroovyPluginFunctionalTest() {
5151 fun `test excludeTestsTrue` () {
5252 buildFile.appendText(
5353 """
54- compileTestJava{}
54+ compileTestJava{}
5555
5656 checkerFramework {
5757 version = "$TEST_CF_VERSION "
@@ -73,6 +73,7 @@ class CFGroovyPluginFunctionalTest : GroovyPluginFunctionalTest() {
7373
7474 assertThat(result.task(" :compileTestJava" )?.outcome).isEqualTo(TaskOutcome .SUCCESS )
7575 assertThat(result.output).containsMatch(" Note: TaintingChecker is type-checking .*Success.java" )
76- assertThat(result.output).doesNotContain(" Note: TaintingChecker is type-checking .*Test.java" )
76+ assertThat(result.output)
77+ .doesNotContainMatch(" Note: TaintingChecker is type-checking .*Test.java" )
7778 }
7879}
Original file line number Diff line number Diff line change @@ -483,6 +483,7 @@ class CfPluginFunctionalTest : KotlinPluginFunctionalTest() {
483483
484484 assertThat(result.task(" :compileTestJava" )?.outcome).isEqualTo(TaskOutcome .SUCCESS )
485485 assertThat(result.output).containsMatch(" Note: TaintingChecker is type-checking .*Success.java" )
486- assertThat(result.output).doesNotContain(" Note: TaintingChecker is type-checking .*Test.java" )
486+ assertThat(result.output)
487+ .doesNotContainMatch(" Note: TaintingChecker is type-checking .*Test.java" )
487488 }
488489}
Original file line number Diff line number Diff line change @@ -104,6 +104,13 @@ class CheckerFrameworkPlugin @Inject constructor() : Plugin<Project> {
104104 options.compilerArgumentProviders.add(CheckerFrameworkCompilerArgumentProvider (cfExtension))
105105 options.forkOptions.jvmArgumentProviders.add(CheckerFrameworkJvmArgumentProvider ())
106106 doFirst {
107+ if (
108+ skipCf ||
109+ ! cfCompileOptions.enabled.getOrElse(true ) ||
110+ (cfExtension.excludeTests.getOrElse(false ) && isTestName(name))
111+ ) {
112+ return @doFirst
113+ }
107114 if (cfExtension.checkers.isPresent) {
108115 val checkers = cfExtension.checkers.get()
109116 if (checkers.isEmpty()) {
@@ -252,7 +259,8 @@ class CheckerFrameworkPlugin @Inject constructor() : Plugin<Project> {
252259
253260 /* * Return true if the Name is a test name. */
254261 private fun isTestName (taskName : String ): Boolean {
255- return taskName.matches(Regex (" (T|(^|[A-Z_])t)est($|[A-Z_])" ))
262+ println (" #$taskName #" )
263+ return taskName.matches(Regex (" .*(T|(^|[A-Z_])t)est.*" ))
256264 }
257265
258266 /* * Provides extraJavacArgs to the compiler. */
You can’t perform that action at this time.
0 commit comments