Skip to content

Commit e91bb8b

Browse files
authored
Merge pull request #658 from AustinShalit/gradleCheck
Update ./gradlew check to run on test files
2 parents 3ca247f + a637461 commit e91bb8b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ install:
3030
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew :ui:jfxNative --stacktrace || ./gradlew --stacktrace '
3131

3232
script:
33-
- ./gradlew checkstyleMain checkstyleTest pmdMain pmdTest findbugsMain findbugsTest jacocoTestReport jacocoRootReport test --stacktrace -Pheadless=true -PlogTests
33+
- ./gradlew check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests
3434

3535
after_success:
3636
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then codecov ; fi

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build_script:
66

77
# to run your custom scripts instead of automatic tests
88
test_script:
9-
- gradlew.bat checkstyleMain checkstyleTest pmdMain pmdTest findbugsMain findbugsTest jacocoTestReport jacocoRootReport test --stacktrace -Pheadless=true -PlogTests
9+
- gradlew.bat check jacocoTestReport jacocoRootReport --stacktrace -Pheadless=true -PlogTests
1010

1111
platform:
1212
- x64

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ plugins {
2121
id 'jacoco'
2222
id 'com.google.osdetector' version '1.4.0'
2323
id 'com.github.johnrengelman.shadow' version '1.2.3'
24+
id "com.dorongold.task-tree" version "1.2.2"
2425
}
2526
apply plugin: 'nebula-aggregate-javadocs'
2627

@@ -116,14 +117,14 @@ configure(subprojects - project(':ui:linuxLauncher')) {
116117

117118
pmd {
118119
consoleOutput = true
119-
sourceSets = [sourceSets.main]
120+
sourceSets = [sourceSets.main, sourceSets.test]
120121
reportsDir = file("$project.buildDir/reports/pmd")
121122
ruleSetFiles = files(new File(rootDir, "pmd-ruleset.xml"))
122123
ruleSets = []
123124
}
124125

125126
findbugs {
126-
sourceSets = [sourceSets.main]
127+
sourceSets = [sourceSets.main, sourceSets.test]
127128
excludeFilter = new File(rootDir, "findBugsSuppressions.xml")
128129
effort = "max"
129130
}

0 commit comments

Comments
 (0)