Fix test convention failures on Windows

This commit is contained in:
Mark Vieira 2021-06-03 16:50:10 -07:00
parent 59c37a1cda
commit 873aa0d32b
2 changed files with 6 additions and 6 deletions

View file

@ -7,7 +7,7 @@
*/
import org.apache.tools.ant.taskdefs.condition.Os
import org.elasticsearch.gradle.OS
import org.elasticsearch.gradle.internal.MavenFilteringHack
import org.elasticsearch.gradle.internal.info.BuildParams
@ -43,6 +43,6 @@ tasks.named("processTestResources").configure {
}
// AwaitsFix https://github.com/elastic/elasticsearch/issues/73539
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
tasks.named("integTest").configure {enabled = false }
tasks.named("integTest").configure {
onlyIf { OS.current() != OS.WINDOWS }
}

View file

@ -1,4 +1,4 @@
import org.apache.tools.ant.taskdefs.condition.Os
import org.elasticsearch.gradle.OS
evaluationDependsOn(xpackModule('core'))
@ -33,6 +33,6 @@ dependencies {
}
// AwaitsFix https://github.com/elastic/elasticsearch/issues/73539
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
tasks.named("internalClusterTest").configure {enabled = false }
tasks.named("internalClusterTest").configure {
onlyIf { OS.current() != OS.WINDOWS }
}