File tree 3 files changed +2
-9
lines changed
buildSrc/src/main/groovy/org/elasticsearch/gradle/test
3 files changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -691,13 +691,6 @@ class ClusterFormationTasks {
691
691
env(key : ' JAVA_HOME' , value : project. runtimeJavaHome)
692
692
}
693
693
node. args. each { arg(value : it) }
694
- if (Os . isFamily(Os . FAMILY_WINDOWS )) {
695
- // Having no TMP on Windows defaults to C:\Windows and permission errors
696
- // Since we configure ant to run with a new environment above, we need to set this to a dir we have access to
697
- File tmpDir = new File (node. baseDir, " tmp" )
698
- tmpDir. mkdirs()
699
- env(key : " TMP" , value : tmpDir. absolutePath)
700
- }
701
694
}
702
695
}
703
696
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ source "`dirname "$0"`"/elasticsearch-env
18
18
19
19
ES_JVM_OPTIONS=" $ES_PATH_CONF " /jvm.options
20
20
JVM_OPTIONS=` " $JAVA " -cp " $ES_CLASSPATH " org.elasticsearch.tools.launchers.JvmOptionsParser " $ES_JVM_OPTIONS " `
21
- ES_JAVA_OPTS=" ${JVM_OPTIONS// \"\ $\{ ES_TMPDIR\}\" / $ES_TMPDIR } $ES_JAVA_OPTS "
21
+ ES_JAVA_OPTS=" ${JVM_OPTIONS// \$\{ ES_TMPDIR\} / $ES_TMPDIR } $ES_JAVA_OPTS "
22
22
23
23
# manual parsing to find out, if process should be detached
24
24
if ! echo $* | grep -E ' (^-d |-d$| -d |--daemonize$|--daemonize )' > /dev/null; then
Original file line number Diff line number Diff line change 86
86
-Dlog4j.shutdownHookEnabled=false
87
87
-Dlog4j2.disable.jmx=true
88
88
89
- -Djava.io.tmpdir=" ${ES_TMPDIR}"
89
+ -Djava.io.tmpdir=${ES_TMPDIR}
90
90
91
91
## heap dumps
92
92
You can’t perform that action at this time.
0 commit comments