Modifications in ClangDocMain.cpp to handle new rebased code

Some more cleanup -- redundant code removed
Cleanup of test cases according to conventions

Author: snarang181

clang-tools-extra/clang-doc/tool/ClangDocMain.cpp

@@ -301,10 +301,7 @@ Example usage for a project using a compile commands database:
   }
 
   if (Format == "mustache") {
-    if (auto Err = getMustacheHtmlFiles(argv[0], CDCtx)) {
-      llvm::errs() << toString(std::move(Err)) << "\n";
-      return 1;
-    }
+    ExitOnErr(getMustacheHtmlFiles(argv[0], CDCtx));
   }
 
   // Mapping phase
@@ -318,7 +315,6 @@ Example usage for a project using a compile commands database:
                    << toString(std::move(Err)) << "\n";
     else {
       ExitOnErr(std::move(Err));
-      return 1;
     }
   }
 
@@ -396,10 +392,7 @@ Example usage for a project using a compile commands database:
   llvm::outs() << "Generating docs...\n";
   ExitOnErr(G->generateDocs(OutDirectory, std::move(USRToInfo), CDCtx));
   llvm::outs() << "Generating assets for docs...\n";
-  Err = G->createResources(CDCtx);
-  if (Err) {
-    llvm::outs() << "warning: " << toString(std::move(Err)) << "\n";
-  }
+  ExitOnErr(G->createResources(CDCtx));
 
   return 0;
 }

clang-tools-extra/test/clang-doc/invalid-options.cpp

@@ -1,12 +1,9 @@
-// Test: Invalid output path (%t is a file, not a directory)
-// RUN: rm -rf %t && echo "not a dir" > %t
-// RUN: not clang-doc %s -output=%t/subdir 2>&1 | FileCheck --check-prefix=BAD-OUTPUT %s
+/// Invalid output path (%t is a file, not a directory)
+// RUN: rm -rf %t && touch %t
+// RUN: not clang-doc %s -output=%t/subdir 2>&1 | FileCheck %s
+// CHECK: clang-doc error:
+// CHECK: {{(Not a directory|no such file or directory)}}
 
-// BAD-OUTPUT: clang-doc error:
-// BAD-OUTPUT: {{(Not a directory|no such file or directory)}}
-
-//
-// Test: Invalid format option
-// RUN: not clang-doc %s -format=badformat 2>&1 | FileCheck --check-prefix=BAD-FORMAT %s
-
-// BAD-FORMAT: clang-doc: for the --format option: Cannot find option named 'badformat'!
+/// Invalid format option
+// RUN: not clang-doc %s -format=badformat 2>&1 | FileCheck %s --check-prefix=BAD-FORMAT
+// BAD-FORMAT: clang-doc: for the --format option: Cannot find option named 'badformat'!