From ffd8c50549f0adc57ba723f471bf6db795c8123f Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Mon, 26 Jul 2021 10:50:48 -0400
Subject: [PATCH] test: use JAMI_DATA_HOME for authority::storage
Change-Id: I97638128e6ebfe474f588ce55beb07ca34b76d28
---
src/authority/storagehelper.cpp | 5 +++++
src/database.cpp | 6 +-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/authority/storagehelper.cpp b/src/authority/storagehelper.cpp
index f252438f..0ca2a5c1 100644
--- a/src/authority/storagehelper.cpp
+++ b/src/authority/storagehelper.cpp
@@ -48,6 +48,11 @@ namespace storage {
QString
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));
// Avoid to depends on the client name.
dataDir.cdUp();
diff --git a/src/database.cpp b/src/database.cpp
index 923f30b4..9ea4055b 100644
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -68,15 +68,11 @@ Database::Database(const QString& name, const QString& basePath)
QString databaseFileName = databaseFile.fileName();
auto absoluteDir = databaseFile.absoluteDir();
-#ifdef ENABLE_TEST
- databaseFullPath_ = QDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation))
- .filePath(databaseFileName);
-#else
// make sure the directory exists
if (!absoluteDir.exists())
absoluteDir.mkpath(".");
databaseFullPath_ = absoluteDir.filePath(databaseFileName);
-#endif
+
db_.setDatabaseName(databaseFullPath_);
}
--
GitLab