fix: runtime errors

close #284, close #285
cppalliance · Jun 12, 2023 · 90668f3 · 90668f3
1 parent ea602c2
commit 90668f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/source/Tool/ConfigImpl.cpp b/source/Tool/ConfigImpl.cpp
@@ -78,11 +78,11 @@ ConfigImpl(
     namespace path = llvm::sys::path;
 
     if(! files::isAbsolute(workingDir_))
-        throw Error("path \"{}\" is not absolute", workingDir_);
+        throw Error("working path \"{}\" is not absolute", workingDir_);
     workingDir = files::makeDirsy(files::normalizePath(workingDir_));
 
     if(auto err = files::requireDirectory(addonsDir_))
-        throw Error("path \"{}\" is not absolute", addonsDir_);
+        throw Error("addons path \"{}\" is not absolute", addonsDir_);
     MRDOX_ASSERT(files::isDirsy(addonsDir_));
     addonsDir = addonsDir_;
 

diff --git a/source/Tool/ConfigImpl.hpp b/source/Tool/ConfigImpl.hpp
@@ -255,7 +255,7 @@ loadConfigString(
     std::string_view addonsDir,
     std::string_view configYaml)
 {
-    return createConfigFromYAML(workingDir, configYaml, "");
+    return createConfigFromYAML(workingDir, addonsDir, configYaml);
 }
 
 } // mrdox

diff --git a/source/Tool/TestAction.cpp b/source/Tool/TestAction.cpp
@@ -145,6 +145,8 @@ makeConfig(
     std::error_code ec;
     auto config = loadConfigString(
         workingDir, toolArgs.addonsDir, configYaml);
+    if (!config)
+      reportError(config.getError(), "load the configuration string");
     MRDOX_ASSERT(config);
     return *config;
 }