Skip to content

3.x: Consolidate test logging #7263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2021
Merged

3.x: Consolidate test logging #7263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f6f1b3
Consolidate test logging
benjamintboyle May 7, 2021
f34f332
Only do parallel testing on non-CI machines
benjamintboyle May 7, 2021
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
67 changes: 27 additions & 40 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ javadoc {
options.addStringOption("top").value = ""
options.addStringOption("doctitle").value = ""
options.addStringOption("header").value = ""
options.stylesheetFile = rootProject.file("gradle/stylesheet.css")
options.stylesheetFile = project.file("gradle/stylesheet.css")

options.links(
"https://docs.oracle.com/javase/8/docs/api/",
Expand Down Expand Up @@ -99,7 +99,7 @@ jar {
}

license {
header rootProject.file("config/license/HEADER")
header project.file("config/license/HEADER")
ext.year = Calendar.getInstance().get(Calendar.YEAR)
skipExistingHeaders true
ignoreFailures true
Expand All @@ -120,51 +120,38 @@ jmh {
}

test {
maxHeapSize = "1200m"
}

task testNG(type: Test) {
useTestNG()
}

check.dependsOn testNG

tasks.withType(Test) {
testLogging {
// showing skipped occasionally should prevent CI timeout due to lack of standard output
events=["skipped", "failed"] // "started", "passed"
// showStandardStreams = true
exceptionFormat="full"
events = ["skipped", "failed"]
exceptionFormat = "full"

debug.events = ["skipped", "failed"]
debug.exceptionFormat="full"
debug.exceptionFormat = "full"

info.events = ["failed", "skipped"]
info.exceptionFormat="full"
info.exceptionFormat = "full"

warn.events = ["failed", "skipped"]
warn.exceptionFormat="full"
warn.exceptionFormat = "full"
}

maxHeapSize = "1200m"

if (System.getenv("CI") == null) {
maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
}
}

task testng(type: Test) {
useTestNG()
testLogging {
events=["skipped", "failed"]
exceptionFormat="full"

debug.events = ["skipped", "failed"]
debug.exceptionFormat="full"

info.events = ["failed", "skipped"]
info.exceptionFormat="full"

warn.events = ["failed", "skipped"]
warn.exceptionFormat="full"
}
}

check.dependsOn testng

jacocoTestReport {
dependsOn test
dependsOn testng
dependsOn testNG

reports {
xml.enabled = true
Expand All @@ -175,18 +162,18 @@ jacocoTestReport {
check.dependsOn jacocoTestReport

checkstyle {
configFile = rootProject.file("config/checkstyle/checkstyle.xml")
configFile = project.file("config/checkstyle/checkstyle.xml")
configProperties = [
"checkstyle.suppressions.file": rootProject.file("config/checkstyle/suppressions.xml"),
"checkstyle.header.file": rootProject.file("config/license/HEADER_JAVA")
"checkstyle.suppressions.file": project.file("config/checkstyle/suppressions.xml"),
"checkstyle.header.file": project.file("config/license/HEADER_JAVA")
]
}

if (rootProject.hasProperty("releaseMode")) {
logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode)
if (project.hasProperty("releaseMode")) {
logger.lifecycle("ReleaseMode: {}", project.releaseMode)

if ("branch" == project.releaseMode) {

if ("branch".equals(rootProject.releaseMode)) {

if (version.endsWith("-SNAPSHOT")) {
publishing {
repositories {
Expand All @@ -204,7 +191,7 @@ if (rootProject.hasProperty("releaseMode")) {
}
}

if ("full".equals(rootProject.releaseMode)) {
if ("full" == project.releaseMode) {
signing {
if (project.hasProperty("SIGNING_PRIVATE_KEY") && project.hasProperty("SIGNING_PASSWORD")) {
useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))
Expand Down