diff options
author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-01-26 12:11:43 +0100 |
---|---|---|
committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-01-26 17:52:52 +0100 |
commit | aea01719326b281aa476eaddd8bd26cebc83ce87 (patch) | |
tree | 0a67a3adc80b5023e7ba2b8909f5f2ccd09fa60c /sonar-application/src | |
parent | b035830c7b7d14a42e72dd8cd0249bbf26f2628f (diff) | |
download | sonarqube-aea01719326b281aa476eaddd8bd26cebc83ce87.tar.gz sonarqube-aea01719326b281aa476eaddd8bd26cebc83ce87.zip |
SONAR-8684 Remove env variable TMPDIR
This variable was only used by rails
Diffstat (limited to 'sonar-application/src')
-rw-r--r-- | sonar-application/src/main/java/org/sonar/application/App.java | 2 | ||||
-rw-r--r-- | sonar-application/src/test/java/org/sonar/application/AppTest.java | 12 |
2 files changed, 0 insertions, 14 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java index b956ed11dbe..04d70c81d93 100644 --- a/sonar-application/src/main/java/org/sonar/application/App.java +++ b/sonar-application/src/main/java/org/sonar/application/App.java @@ -114,8 +114,6 @@ public class App implements Stoppable { .addJavaOptions(props.nonNullValue(ProcessProperties.WEB_JAVA_ADDITIONAL_OPTS)) // required for logback tomcat valve .setEnvVariable(ProcessProperties.PATH_LOGS, props.nonNullValue(ProcessProperties.PATH_LOGS)) - // ensure JRuby uses SQ's temp directory as temp directory (eg. for temp files used during HTTP uploads) - .setEnvVariable("TMPDIR", props.nonNullValue(ProcessProperties.PATH_TEMP)) .setClassName("org.sonar.server.app.WebServer") .addClasspath("./lib/common/*") .addClasspath("./lib/server/*"); diff --git a/sonar-application/src/test/java/org/sonar/application/AppTest.java b/sonar-application/src/test/java/org/sonar/application/AppTest.java index 1c1ac6ab110..7a7a79c7816 100644 --- a/sonar-application/src/test/java/org/sonar/application/AppTest.java +++ b/sonar-application/src/test/java/org/sonar/application/AppTest.java @@ -35,7 +35,6 @@ import org.sonar.process.monitor.JavaCommand; import org.sonar.process.monitor.Monitor; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.entry; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -114,17 +113,6 @@ public class AppTest { } @Test - public void sets_TMPDIR_env_var_of_Web_process() throws Exception { - Props props = initDefaultProps(); - String expectedTmpDir = "expected tmp dir"; - props.set("sonar.path.temp", expectedTmpDir); - - List<JavaCommand> commands = start(props); - - assertThat(commands.get(1).getEnvVariables()).contains(entry("TMPDIR", expectedTmpDir)); - } - - @Test public void configure_http_and_https_proxies_on_all_processes() throws Exception { Props props = initDefaultProps(); // These properties can be defined in conf/sonar.properties. |