File tree Expand file tree Collapse file tree 1 file changed +5
-7
lines changed
Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -69,8 +69,7 @@ tasks.register('jre') {
6969 doLast {
7070 def installationPath = javaLauncher. get(). metadata. installationPath
7171
72- def exe = Os . isFamily(Os . FAMILY_WINDOWS ) ? ' bin\\ jlink.exe' : ' bin/jlink'
73- def jlink = installationPath. file(exe)
72+ def jlink = installationPath. file(Os . isFamily(Os . FAMILY_WINDOWS ) ? ' bin\\ jlink.exe' : ' bin/jlink' )
7473 def jmods = installationPath. dir(' jmods' )
7574
7675 def output = providers. exec {
@@ -85,10 +84,10 @@ tasks.register('jre') {
8584 }
8685
8786 def result = output. result. get()
88- if (result. exitValue != 0 ) {
89- logger. log(LogLevel . ERROR , output. standardError. asText. get())
90- } else {
87+ if (result. exitValue == 0 ) {
9188 logger. info(output. standardOutput. asText. get())
89+ } else {
90+ logger. log(LogLevel . ERROR , output. standardError. asText. get())
9291 }
9392
9493 result. assertNormalExitValue()
@@ -100,8 +99,7 @@ test {
10099 dependsOn tasks. named(' jre' )
101100 inputs. dir(jreOutputDir)
102101
103- def exe = Os . isFamily(Os . FAMILY_WINDOWS ) ? ' bin\\ java.exe' : ' bin/java'
104- executable = jreOutputDir. get(). file(exe)
102+ executable = jreOutputDir. get(). file(Os . isFamily(Os . FAMILY_WINDOWS ) ? ' bin\\ java.exe' : ' bin/java' )
105103
106104 useJUnitPlatform()
107105 finalizedBy jacocoTestReport
You can’t perform that action at this time.
0 commit comments