DataSet, and create a small lib to be used by tests

1 files changed, 13 insertions, 11 deletions

diff --git a/tests/hawd/state.cpp b/tests/hawd/state.cpp
index cfc4326..3ee7775 100644
--- a/tests/hawd/state.cpp
+++ b/tests/hawd/state.cpp
@@ -31,22 +31,24 @@ static const QString configFileName("hawd.conf");
 namespace HAWD
 {
 
-State::State()
+State::State(const QString &_configPath)
     : m_valid(true)
 {
-    QDir dir;
-    QString configPath;
+    QString configPath = _configPath;
+    if (configPath.isEmpty()) {
+        QDir dir;
 
-    while (!dir.exists(configFileName) && dir.cdUp()) { }
+        while (!dir.exists(configFileName) && dir.cdUp()) { }
 
-    if (dir.exists(configFileName)) {
-        configPath = dir.absoluteFilePath(configFileName);
-    }
+        if (dir.exists(configFileName)) {
+            configPath = dir.absoluteFilePath(configFileName);
+        }
 
-    if (configPath.isEmpty()) {
-        std::cerr << QObject::tr("Could not find hawd configuration. A hawd.conf file must be in the current directory or in a directory above it.").toStdString() << std::endl;
-        m_valid = false;
-        return;
+        if (configPath.isEmpty()) {
+            std::cerr << QObject::tr("Could not find hawd configuration. A hawd.conf file must be in the current directory or in a directory above it.").toStdString() << std::endl;
+            m_valid = false;
+            return;
+        }
     }
 
     QFile configFile(configPath);