@@ -32,6 +32,10 @@ allprojects {
32
32
println " projectDir : " + projectDir
33
33
println " groupId : " + project. group
34
34
println " targetCompatibility : " + java. targetCompatibility
35
+ println " OS : " + System . properties[" os.name" ]
36
+ println " Java VM Name : " + System . properties[" java.vm.name" ]
37
+ println " Java VM Vendor : " + System . properties[" java.vm.vendor" ]
38
+ println " Java VM Version : " + System . properties[" java.vm.version" ]
35
39
println " =" * 80
36
40
}
37
41
}
@@ -91,27 +95,36 @@ configure(subprojects) {
91
95
// apply plugin: 'codenarc'
92
96
}
93
97
94
- tasks. register(" integrationTest " ) {
98
+ tasks. register(" integrationTestOnly " ) {
95
99
group(" Verification" )
96
- description(" Run overall integration tests" )
100
+ description(" Run overall integration tests (no publish) " )
97
101
98
102
final String INTEGRATION_TEST_DIRECTORY = " integration-test/gradle-plugin"
99
103
100
104
doLast {
101
105
def result = exec {
102
106
workingDir INTEGRATION_TEST_DIRECTORY
103
- commandLine " ./gradlew" , " clean" , " htmlSanityCheck" , " -PhtmlSanityCheckVersion=${ project.version} "
107
+ commandLine System . getProperty( " os.name " ) ==~ / Windows.* / ? " gradlew.bat " : " ./gradlew" , " clean" , " htmlSanityCheck" , " -PhtmlSanityCheckVersion=${ project.version} "
104
108
}
105
109
logger. debug " Script output: $result "
106
110
File integrationTestDirectory = file(INTEGRATION_TEST_DIRECTORY )
107
111
final File testIndex = new File (integrationTestDirectory, " build/reports/index.html" )
108
112
assert testIndex. exists()
109
113
}
110
114
}
111
- integrationTest . dependsOn (
115
+ integrationTestOnly . mustRunAfter (
112
116
' :htmlSanityCheck-core:publishAllPublicationsToMyLocalRepositoryForFullIntegrationTestsRepository' ,
113
117
' :htmlSanityCheck-gradle-plugin:publishAllPublicationsToMyLocalRepositoryForFullIntegrationTestsRepository'
114
118
)
119
+ tasks. register(" integrationTest" ) {
120
+ group(" Verification" )
121
+ description(" Run overall integration tests (and publish first)" )
122
+ }
123
+ integrationTest. dependsOn(
124
+ ' :htmlSanityCheck-core:publishAllPublicationsToMyLocalRepositoryForFullIntegrationTestsRepository' ,
125
+ ' :htmlSanityCheck-gradle-plugin:publishAllPublicationsToMyLocalRepositoryForFullIntegrationTestsRepository' ,
126
+ ' integrationTestOnly'
127
+ )
115
128
116
129
/*
117
130
* Copyright Gernot Starke and aim42 contributors.
0 commit comments