Skip to content

Commit

Permalink
Build: Make additional test deps of check (#32015)
Browse files Browse the repository at this point in the history
This commit moves additional unit test runners from being dependencies
of the test task to dependencies of check. Without this change,
reproduce lines are incorrect due to the additional test runner not
matching any of the reproduce class/method info.

closes #31964
  • Loading branch information
rjernst committed Jul 17, 2018
1 parent 461baec commit 34e7858
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,8 @@ class BuildPlugin implements Plugin<Project> {
additionalTest.testClassesDirs = test.testClassesDirs
additionalTest.configure(commonTestConfig(project))
additionalTest.configure(config)
test.dependsOn(additionalTest)
additionalTest.dependsOn(project.tasks.testClasses)
project.check.dependsOn(additionalTest)
});
return test
}
Expand Down
10 changes: 10 additions & 0 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,16 @@ if (isEclipse) {
compileJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-try,-unchecked"
compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-try,-unchecked"

// TODO: remove ScriptDocValuesMissingV6BehaviourTests in 7.0
additionalTest('testScriptDocValuesMissingV6Behaviour'){
include '**/ScriptDocValuesMissingV6BehaviourTests.class'
systemProperty 'es.scripting.exception_for_missing_value', 'false'
}
test {
// these are tested explicitly in separate test tasks
exclude '**/*ScriptDocValuesMissingV6BehaviourTests.class'
}

forbiddenPatterns {
exclude '**/*.json'
exclude '**/*.jmx'
Expand Down

0 comments on commit 34e7858

Please sign in to comment.