Skip to content

Commit 2f93e11

Browse files
andsellogstashmachine
authored andcommitted
Added :jvm-options-parser subproject to the javaTests task (#15957)
Adds a global new task named javaTests which groups both :logstash-core:javaTests and :jvm-options-parser:test to include the JvmOptionParser unit test in javaTests phase. (cherry picked from commit c30fe46)
1 parent 25af45b commit 2f93e11

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ allprojects {
100100
"--add-opens=java.base/java.lang=ALL-UNNAMED",
101101
"--add-opens=java.base/java.util=ALL-UNNAMED"
102102
]
103-
//https://stackoverflow.com/questions/3963708/gradle-how-to-display-test-results-in-the-console-in-real-time
104-
testLogging {
103+
//https://stackoverflow.com/questions/3963708/gradle-how-to-display-test-results-in-the-console-in-real-time
104+
testLogging {
105105
// set options for log level LIFECYCLE
106106
events "passed", "skipped", "failed", "standardOut"
107107
showExceptions true
@@ -898,6 +898,11 @@ tasks.register("extractBundledJdkVersion", ExtractBundledJdkVersion) {
898898
osName = selectOsType()
899899
}
900900

901+
tasks.register("javaTests") {
902+
dependsOn ":logstash-core:javaTests"
903+
dependsOn ":jvm-options-parser:test"
904+
}
905+
901906
clean {
902907
String jdkVersionFilename = tasks.findByName("extractBundledJdkVersion").outputFilename
903908
delete "${projectDir}/${jdkVersionFilename}"

tools/jvm-options-parser/src/test/java/org/logstash/launchers/JvmOptionsParserTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,5 @@ private void verifyOptions(String message, String expected, JvmOptionsParser.Par
166166
private BufferedReader asReader(String s) {
167167
return new BufferedReader(new StringReader(s));
168168
}
169+
169170
}

0 commit comments

Comments
 (0)