aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-01-07 13:19:27 +0100
committerHarald Musum <musum@yahooinc.com>2022-01-07 13:19:27 +0100
commitd6f4ce3a54daab7577b2b65432168aa65f00950d (patch)
tree53c203deb36936d0db4de8f54809c0b91c476d1e /config-model/src/test
parentea8199921bb9b46e86ef7f2c715c2e00b0708ade (diff)
Allow comma in JVM options
Diffstat (limited to 'config-model/src/test')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
index 96fbce03e88..01f5e1ee776 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JvmOptionsTest.java
@@ -196,7 +196,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
List<String> strings = Arrays.asList(invalidOptions.clone());
// Verify that nothing is logged if there are no invalid options
if (strings.isEmpty()) {
- assertEquals(0, logger.msgs.size());
+ assertEquals(logger.msgs.size() > 0 ? logger.msgs.get(0).getSecond() : "", 0, logger.msgs.size());
return;
}
@@ -246,7 +246,7 @@ public class JvmOptionsTest extends ContainerModelBuilderTestBase {
// Valid options, should not log anything
verifyLoggingOfJvmOptions(true, "options", "-Xms2G");
verifyLoggingOfJvmOptions(true, "options", "-verbose:gc");
- verifyLoggingOfJvmOptions(true, "options", "-Djava.library.path=/opt/vespa/lib64:/home/y/lib64");
+ verifyLoggingOfJvmOptions(true, "options", "-Djava.library.path=/opt/vespa/lib64:/home/y/lib64 -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005");
verifyLoggingOfJvmOptions(false, "options", "-Xms2G");
}