Skip to content
Snippets Groups Projects
Commit ffd8c505 authored by Ming Rui Zhang's avatar Ming Rui Zhang
Browse files

test: use JAMI_DATA_HOME for authority::storage

Change-Id: I97638128e6ebfe474f588ce55beb07ca34b76d28
parent 6ca9af61
Branches
No related tags found
No related merge requests found
...@@ -48,6 +48,11 @@ namespace storage { ...@@ -48,6 +48,11 @@ namespace storage {
QString QString
getPath() getPath()
{ {
#ifdef Q_OS_WIN
auto definedDataDir = qEnvironmentVariable("JAMI_DATA_HOME");
if (!definedDataDir.isEmpty())
return QDir(definedDataDir).absolutePath() + "/";
#endif
QDir dataDir(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)); QDir dataDir(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation));
// Avoid to depends on the client name. // Avoid to depends on the client name.
dataDir.cdUp(); dataDir.cdUp();
......
...@@ -68,15 +68,11 @@ Database::Database(const QString& name, const QString& basePath) ...@@ -68,15 +68,11 @@ Database::Database(const QString& name, const QString& basePath)
QString databaseFileName = databaseFile.fileName(); QString databaseFileName = databaseFile.fileName();
auto absoluteDir = databaseFile.absoluteDir(); auto absoluteDir = databaseFile.absoluteDir();
#ifdef ENABLE_TEST
databaseFullPath_ = QDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation))
.filePath(databaseFileName);
#else
// make sure the directory exists // make sure the directory exists
if (!absoluteDir.exists()) if (!absoluteDir.exists())
absoluteDir.mkpath("."); absoluteDir.mkpath(".");
databaseFullPath_ = absoluteDir.filePath(databaseFileName); databaseFullPath_ = absoluteDir.filePath(databaseFileName);
#endif
db_.setDatabaseName(databaseFullPath_); db_.setDatabaseName(databaseFullPath_);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment