This changes the debug output of the llvm-cov tool to consistently
write to stderr, and moves the highlighting output closer to where
it's relevant.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217838
91177308-0d34-0410-b5e6-
96231b3b80d8
-// RUN: llvm-cov show %S/Inputs/showExpansions.covmapping -instr-profile %S/Inputs/showExpansions.profdata -dump -show-expansions -filename-equivalence %s | FileCheck %s
+// RUN: llvm-cov show %S/Inputs/showExpansions.covmapping -instr-profile %S/Inputs/showExpansions.profdata -dump -show-expansions -filename-equivalence %s 2>&1 | FileCheck %s
#define DO_SOMETHING_ELSE() \
do { \
-// RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -dump -filename-equivalence %s | FileCheck %s
+// RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -dump -filename-equivalence %s 2>&1 | FileCheck %s
void func() {
return;
auto ExpandedLines = findExpandedFileInterestingLineRange(
ExpandedRegion.ExpandedFileID, Function);
if (ViewOpts.Debug)
- llvm::outs() << "Expansion of " << ExpandedRegion.ExpandedFileID << ":"
+ llvm::errs() << "Expansion of " << ExpandedRegion.ExpandedFileID << ":"
<< ExpandedLines.first << " -> " << ExpandedLines.second
<< " @ " << ExpandedRegion.FileID << ", "
<< ExpandedRegion.LineStart << ":"
for (const auto &R : I.MappingRegions) {
// Compute the values of mapped regions
if (ViewOpts.Debug) {
- outs() << "File " << R.FileID << "| " << R.LineStart << ":"
+ errs() << "File " << R.FileID << "| " << R.LineStart << ":"
<< R.ColumnStart << " -> " << R.LineEnd << ":" << R.ColumnEnd
<< " = ";
Ctx.dump(R.Count);
if (R.Kind == CounterMappingRegion::ExpansionRegion) {
- outs() << " (Expanded file id = " << R.ExpandedFileID << ") ";
+ errs() << " (Expanded file id = " << R.ExpandedFileID << ") ";
}
- outs() << "\n";
+ errs() << "\n";
}
ErrorOr<int64_t> ExecutionCount = Ctx.evaluate(R.Count);
if (ExecutionCount) {
// Show the rest of the line
OS << Line.substr(Start - 1, Line.size() - Start + 1);
OS << "\n";
+
+ if (Options.Debug) {
+ for (const auto &Range : Ranges) {
+ errs() << "Highlighted line " << Range.Line << ", " << Range.ColumnStart
+ << " -> ";
+ if (Range.ColumnEnd == std::numeric_limits<unsigned>::max()) {
+ errs() << "?\n";
+ } else {
+ errs() << Range.ColumnEnd << "\n";
+ }
+ }
+ }
}
void SourceCoverageView::renderOffset(raw_ostream &OS, unsigned I) {
}
std::sort(HighlightRanges.begin(), HighlightRanges.end());
-
- if (Options.Debug) {
- for (const auto &Range : HighlightRanges) {
- outs() << "Highlighted line " << Range.Line << ", " << Range.ColumnStart
- << " -> ";
- if (Range.ColumnEnd == std::numeric_limits<unsigned>::max()) {
- outs() << "?\n";
- } else {
- outs() << Range.ColumnEnd << "\n";
- }
- }
- }
}
void SourceCoverageView::createRegionMarkers(SourceCoverageDataManager &Data) {