Add support for tests.jvm.argline in testclusters (#46540)

We have CI jobs that make use of this for testing alternative garbadge
collectors.
This commit is contained in:
Alpar Torok 2019-09-12 11:31:08 +03:00
parent e57756492a
commit 9f2c5632fe
1 changed files with 5 additions and 2 deletions

View File

@ -599,8 +599,11 @@ public class ElasticsearchNode implements TestClusterConfiguration {
}) })
.collect(Collectors.joining(" ")); .collect(Collectors.joining(" "));
} }
defaultEnv.put("ES_JAVA_OPTS", "-Xms512m -Xmx512m -ea -esa" + defaultEnv.put("ES_JAVA_OPTS", "-Xms512m -Xmx512m -ea -esa " +
systemPropertiesString + jvmArgsString systemPropertiesString + " " +
jvmArgsString + " " +
// Support passing in additional JVM arguments
System.getProperty("tests.jvm.argline", "")
); );
defaultEnv.put("ES_TMPDIR", tmpDir.toString()); defaultEnv.put("ES_TMPDIR", tmpDir.toString());
// Windows requires this as it defaults to `c:\windows` despite ES_TMPDIR // Windows requires this as it defaults to `c:\windows` despite ES_TMPDIR