test work

Author: vinniefalco

CMakeLists.txt

@@ -72,7 +72,9 @@ file(GLOB_RECURSE LIB_SOURCES CONFIGURE_DEPENDS
 )
 
 file(GLOB_RECURSE TOOL_SOURCES CONFIGURE_DEPENDS
-    source/mrdox/mrdox.cpp
+    source/mrdox/*.h
+    source/mrdox/*.hpp
+    source/mrdox/*.cpp
 )
 
 file(GLOB_RECURSE TEST_SOURCES CONFIGURE_DEPENDS

include/mrdox/mrdox.hpp

@@ -9,15 +9,13 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include <mrdox/mrdox.hpp>
-
 #include "Generators.h"
 #include "Representation.h"
 #include <mrdox/ClangDocContext.hpp>
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
+#include <clang/Tooling/Tooling.h>
+#include <llvm/ADT/StringRef.h>
+#include <llvm/Support/FileSystem.h>
+#include <llvm/Support/Path.h>
 
 //------------------------------------------------
 /*
@@ -520,6 +518,7 @@ Format = "xml";
 
 //------------------------------------------------
 
+#if 0
 llvm::Expected<llvm::Twine>
 renderXML(
     llvm::StringRef fileName)
@@ -533,6 +532,7 @@ renderXML(
 
     return llvm::Twine();
 }
+#endif
 
 //------------------------------------------------
 

source/lib/XMLGenerator.cpp

@@ -10,7 +10,7 @@
 
 #include "ClangDoc.h"
 #include "Representation.h"
-#include <mrdox/mrdox.hpp>
+#include <mrdox/ClangDocContext.hpp>
 #include <clang/tooling/Tooling.h>
 #include <llvm/ADT/StringRef.h>
 #include <llvm/Support/Signals.h>
@@ -40,6 +40,13 @@ do_main(int argc, const char** argv)
 
     llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
 
+    ClangDocContext CDCtx;
+    if(llvm::Error err = setupContext(CDCtx, argc, argv))
+    {
+        llvm::errs() << "test failure: " << err << "\n";
+        return EXIT_FAILURE;
+    }
+
     for(int i = 1; i < argc; ++i)
     {
         std::error_code ec;
@@ -110,39 +117,11 @@ do_main(int argc, const char** argv)
         }
         expectedXml = xmlResult->get()->getBuffer();
 
-        ClangDocContext CDCtx;
-
-        {
-#if 0
-            auto Executor =
-                clang::tooling::createExecutorFromCommandLineArgs(
-                    1,
-                    "tests",
-                    "cat",
-                    "overview");
-
-            if (!Executor)
-            {
-                llvm::errs() << toString(Executor.takeError()) << "\n";
-                return 1;
-            }
-            clang::mrdox::ClangDocContext CDCtx = {
-                Executor->get()->getExecutionContext(),
-                "tests",
-                false,
-                ".",
-                ".",
-                ".",
-                {},
-                {} };
-
-            bool success = clang::tooling::runToolOnCode(
-                makeFrontendAction(CDCtx), cppCode, cppPath);
-            if(! success)
-                llvm::errs() <<
-                    "Frontend action failed\n";
-#endif
-        }
+        bool success = clang::tooling::runToolOnCode(
+            makeFrontendAction(CDCtx), cppCode, cppPath);
+        if(! success)
+            llvm::errs() <<
+                "Frontend action failed\n";
     }
 
     return EXIT_SUCCESS;