Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2d9c898
Replace usages RandomizedTestingTask with built-in Gradle Test
mark-vieira Mar 27, 2019
0e9a24c
Workaround for test conventions enforcement
mark-vieira Mar 28, 2019
6536c59
Merge remote-tracking branch 'origin/master' into gradle-test-runner
mark-vieira Mar 28, 2019
8bb56d4
Fix up some merge conflicts
mark-vieira Mar 28, 2019
22d4db8
Use existing mechanism for determining test parallelism
mark-vieira Mar 28, 2019
5437841
Fix overzelous find and replace
mark-vieira Mar 28, 2019
a6e23f2
Tweak test event output
mark-vieira Mar 28, 2019
fb8e639
Log strait to std streams as it's faster and doesn't introduce extra …
mark-vieira Mar 28, 2019
33a5cd3
Remove unnecessary conditional
mark-vieira Mar 28, 2019
8081e84
Remove unnecessary check
mark-vieira Mar 28, 2019
ee88d66
Prefix test log output with std stream identifier
mark-vieira Mar 28, 2019
9e882d8
Fix overzelous find and replace
mark-vieira Mar 28, 2019
7df907d
Fix overzelous find and replace
mark-vieira Mar 28, 2019
d63296a
Fix overzelous find and replace
mark-vieira Mar 28, 2019
ceecad6
Fix overzelous find and replace
mark-vieira Mar 28, 2019
371dba7
Simplify parallelism logic
mark-vieira Mar 28, 2019
71a7bb2
Disable test tasks when Docker is required but not available
mark-vieira Mar 28, 2019
313fb10
Revert "Remove unnecessary conditional"
mark-vieira Mar 28, 2019
d968dd2
Fix issue with tests hanging on Java 8 and lower
mark-vieira Mar 29, 2019
4ad3b25
Convert ErrorReportingTestListener to Java
mark-vieira Mar 29, 2019
38903e7
Ignore problematic system properties
mark-vieira Mar 29, 2019
3590f53
Cap parallelism if we can't determine physical cores available
mark-vieira Mar 29, 2019
3364048
Cap parallelism if we can't determine physical cores available
mark-vieira Mar 29, 2019
e773c64
Catch situations where we don't properly apply unit test config
mark-vieira Mar 29, 2019
0ee1a0c
Another lazy gstring system property
mark-vieira Mar 29, 2019
e7a504f
Merge remote-tracking branch 'origin/master' into gradle-test-runner
mark-vieira Mar 29, 2019
dfc82b9
Simply parallel forks logic
mark-vieira Mar 29, 2019
6b6b5c4
Use gradle `--tests` option in test failure reproduction line
mark-vieira Mar 29, 2019
abf29c3
More lazy gstring system properties
mark-vieira Mar 29, 2019
1d74b97
Ditch usages of DefaultGroovyMethods.
mark-vieira Mar 29, 2019
636c067
Ditch extra newlines
mark-vieira Mar 29, 2019
3d19d70
Fix lazy task config
mark-vieira Mar 29, 2019
148a964
Fix integ test system properties when using testclusters plugin
mark-vieira Mar 29, 2019
12f454e
Fix attachment processor tests
mark-vieira Mar 30, 2019
c2951ce
Merge remote-tracking branch 'origin/master' into gradle-test-runner
mark-vieira Mar 30, 2019
7801b8f
Merge remote-tracking branch 'origin/master' into gradle-test-runner
mark-vieira Apr 1, 2019
4fe39f5
Merge remote-tracking branch 'origin/master' into gradle-test-runner
mark-vieira Apr 1, 2019
a245b22
Don't both setting the test seed on all subprojects
mark-vieira Apr 2, 2019
cf9b01b
Improve test failure reporting
mark-vieira Apr 2, 2019
7cc13b2
Merge remote-tracking branch 'origin/master' into gradle-test-runner
mark-vieira Apr 3, 2019
5e0b83c
Merge remote-tracking branch 'origin/master' into gradle-test-runner
mark-vieira Apr 4, 2019
429a506
Remove duplicate code in overridden method
mark-vieira Apr 4, 2019
395a8ed
Mark logger final
mark-vieira Apr 4, 2019
8d67e0d
Declare variables with explicit types
mark-vieira Apr 4, 2019
11c5133
Merge remote-tracking branch 'origin/master' into gradle-test-runner
mark-vieira Apr 8, 2019
78ff5fd
"unitTest" is now called "test"
mark-vieira Apr 8, 2019
fed1dcd
Spool test output to disk so we don't explode daemon heap
mark-vieira Apr 8, 2019
2141866
Defer test suite output dir creation until execution time
mark-vieira Apr 8, 2019
06cf1de
Remove unused import
mark-vieira Apr 8, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ mainClassName = 'org.openjdk.jmh.Main'
assemble.enabled = false
archivesBaseName = 'elasticsearch-benchmarks'

unitTest.enabled = false
test.enabled = false

dependencies {
compile("org.elasticsearch:elasticsearch:${version}") {
Expand Down
11 changes: 2 additions & 9 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -198,17 +198,14 @@ if (project != rootProject) {
from configurations.distribution
into localDownloads
}

// This can't be an RandomizedTestingTask because we can't yet reference it

task integTest(type: Test) {
// integration test requires the local testing repo for example plugin builds
dependsOn project.rootProject.allprojects.collect {
it.tasks.matching { it.name == 'publishNebulaPublicationToLocalTestRepository'}
}
dependsOn setupLocalDownloads
exclude "**/*Tests.class"
testClassesDirs = sourceSets.test.output.classesDirs
classpath = sourceSets.test.runtimeClasspath
inputs.dir(file("src/testKit"))
// tell BuildExamplePluginsIT where to find the example plugins
systemProperty (
Expand All @@ -224,11 +221,7 @@ if (project != rootProject) {
if (isLuceneSnapshot) {
systemProperty 'test.lucene-snapshot-revision', isLuceneSnapshot[0][1]
}
String defaultParallel = System.getProperty('tests.jvms', project.rootProject.ext.defaultParallel)
if (defaultParallel == "auto") {
defaultParallel = Math.max(Runtime.getRuntime().availableProcessors(), 4)
}
maxParallelForks defaultParallel as Integer
maxParallelForks System.getProperty('tests.jvms', project.rootProject.ext.defaultParallel.toString()) as Integer
}
check.dependsOn(integTest)

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading