Setup jvm opts correctly for deb tests

Also stops warning about JAVA_OPTS when it is an empty string.
This commit is contained in:
Nik Everett 2016-04-13 11:08:27 -04:00
parent 96456fbd91
commit bf2483e4b3
2 changed files with 2 additions and 1 deletions

View File

@ -140,6 +140,7 @@ class NodeInfo {
args.add("${property.getKey()}=${property.getValue()}")
}
}
env.put('ES_JVM_OPTIONS', new File(confDir, 'jvm.options'))
args.addAll("-E", "es.path.conf=${confDir}")
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
args.add('"') // end the entire command, quoted

View File

@ -167,7 +167,7 @@ fi
# JAVA_OPTS is not a built-in JVM mechanism but some people think it is
# so let us warn them that we are not observing the value of $JAVA_OPTS
if [ ! -z "JAVA_OPTS" ]; then
if [ "x$JAVA_OPTS" != "x" ]; then
echo "Warning: Ignoring JAVA_OPTS=$JAVA_OPTS"
echo "Please pass JVM parameters via ES_JAVA_OPTS instead"
fi