summaryrefslogtreecommitdiffstats
path: root/server/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-08-07 00:49:53 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-08-07 00:51:14 +0200
commit81006aa4f9220de48ed20c9d678c3756c7bb7399 (patch)
tree991e88874f8f35bf0b30ba4685cb6fb7514cdeac /server/sonar-server
parent868917eb6c27fbbe552b9234a6c698ab10f5549f (diff)
downloadsonarqube-81006aa4f9220de48ed20c9d678c3756c7bb7399.tar.gz
sonarqube-81006aa4f9220de48ed20c9d678c3756c7bb7399.zip
Fix merge
Diffstat (limited to 'server/sonar-server')
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
index 0d59a149ea8..20689769478 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/db/EmbeddedDatabaseTest.java
@@ -91,7 +91,8 @@ public class EmbeddedDatabaseTest {
return new Settings()
.setProperty(DatabaseProperties.PROP_USER, "login")
.setProperty(DatabaseProperties.PROP_PASSWORD, "pwd")
- .setProperty(DatabaseProperties.PROP_EMBEDDED_PORT, "" + port);
+ .setProperty(DatabaseProperties.PROP_EMBEDDED_PORT, "" + port)
+ .setProperty("sonar.path.data", "./target/testDB");
}
static int freeServerPort() throws IOException {