Fix fips tests for vanilla Test tasks (#74969) (#74981)

breskeby · breskeby · commit 02627857e0a0 · 2021-07-06T17:50:53.000+02:00
This fixes a regression introduced with #74670. Vanilla test tasks (of plain type Test) must also dependOn `fipsResources` when build is run in FIPS mode. Otherwise we see the plain test task failing with "SHA MessageDigest not available" Fixes #74922
diff --git a/build-tools-internal/src/main/groovy/elasticsearch.fips.gradle b/build-tools-internal/src/main/groovy/elasticsearch.fips.gradle
@@ -92,6 +92,7 @@ if (BuildParams.inFipsJvm) {
         }
       }
       project.tasks.withType(Test).configureEach { Test task ->
+        dependsOn 'fipsResources'
         task.systemProperty('javax.net.ssl.trustStorePassword', 'password')
         task.systemProperty('javax.net.ssl.keyStorePassword', 'password')
         task.systemProperty('javax.net.ssl.trustStoreType', 'BCFKS')

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ if (BuildParams.inFipsJvm) {`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`project.tasks.withType(Test).configureEach { Test task ->`
	`95`	`+ dependsOn 'fipsResources'`
`95`	`96`	`task.systemProperty('javax.net.ssl.trustStorePassword', 'password')`
`96`	`97`	`task.systemProperty('javax.net.ssl.keyStorePassword', 'password')`
`97`	`98`	`task.systemProperty('javax.net.ssl.trustStoreType', 'BCFKS')`