llvm-cov/CoverageReport.cpp: Quick fix for msvcrt, since width specifier "z" is unavailable.

Note, mingw uses its own printf instead of msvcrt.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218723 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi 2014-10-01 00:29:26 +00:00
parent 5a82a26eb9
commit a7ac986332

View File

@ -110,17 +110,17 @@ static raw_ostream::Colors determineCoveragePercentageColor(const T &Info) {
void CoverageReport::render(const FileCoverageSummary &File, raw_ostream &OS) { void CoverageReport::render(const FileCoverageSummary &File, raw_ostream &OS) {
OS << column(File.Name, FileReportColumns[0], Column::LeftTrim) OS << column(File.Name, FileReportColumns[0], Column::LeftTrim)
<< format("%*zd", FileReportColumns[1], File.RegionCoverage.NumRegions); << format("%*u", FileReportColumns[1], (unsigned)File.RegionCoverage.NumRegions);
Options.colored_ostream(OS, File.RegionCoverage.isFullyCovered() Options.colored_ostream(OS, File.RegionCoverage.isFullyCovered()
? raw_ostream::GREEN ? raw_ostream::GREEN
: raw_ostream::RED) : raw_ostream::RED)
<< format("%*zd", FileReportColumns[2], File.RegionCoverage.NotCovered); << format("%*u", FileReportColumns[2], (unsigned)File.RegionCoverage.NotCovered);
Options.colored_ostream(OS, Options.colored_ostream(OS,
determineCoveragePercentageColor(File.RegionCoverage)) determineCoveragePercentageColor(File.RegionCoverage))
<< format("%*.2f", FileReportColumns[3] - 1, << format("%*.2f", FileReportColumns[3] - 1,
File.RegionCoverage.getPercentCovered()) << '%'; File.RegionCoverage.getPercentCovered()) << '%';
OS << format("%*zd", FileReportColumns[4], OS << format("%*u", FileReportColumns[4],
File.FunctionCoverage.NumFunctions); (unsigned)File.FunctionCoverage.NumFunctions);
Options.colored_ostream( Options.colored_ostream(
OS, determineCoveragePercentageColor(File.FunctionCoverage)) OS, determineCoveragePercentageColor(File.FunctionCoverage))
<< format("%*.2f", FileReportColumns[5] - 1, << format("%*.2f", FileReportColumns[5] - 1,
@ -131,24 +131,24 @@ void CoverageReport::render(const FileCoverageSummary &File, raw_ostream &OS) {
void CoverageReport::render(const FunctionCoverageSummary &Function, void CoverageReport::render(const FunctionCoverageSummary &Function,
raw_ostream &OS) { raw_ostream &OS) {
OS << column(Function.Name, FunctionReportColumns[0], Column::RightTrim) OS << column(Function.Name, FunctionReportColumns[0], Column::RightTrim)
<< format("%*zd", FunctionReportColumns[1], << format("%*u", FunctionReportColumns[1],
Function.RegionCoverage.NumRegions); (unsigned)Function.RegionCoverage.NumRegions);
Options.colored_ostream(OS, Function.RegionCoverage.isFullyCovered() Options.colored_ostream(OS, Function.RegionCoverage.isFullyCovered()
? raw_ostream::GREEN ? raw_ostream::GREEN
: raw_ostream::RED) : raw_ostream::RED)
<< format("%*zd", FunctionReportColumns[2], << format("%*u", FunctionReportColumns[2],
Function.RegionCoverage.NotCovered); (unsigned)Function.RegionCoverage.NotCovered);
Options.colored_ostream( Options.colored_ostream(
OS, determineCoveragePercentageColor(Function.RegionCoverage)) OS, determineCoveragePercentageColor(Function.RegionCoverage))
<< format("%*.2f", FunctionReportColumns[3] - 1, << format("%*.2f", FunctionReportColumns[3] - 1,
Function.RegionCoverage.getPercentCovered()) << '%'; Function.RegionCoverage.getPercentCovered()) << '%';
OS << format("%*zd", FunctionReportColumns[4], OS << format("%*u", FunctionReportColumns[4],
Function.LineCoverage.NumLines); (unsigned)Function.LineCoverage.NumLines);
Options.colored_ostream(OS, Function.LineCoverage.isFullyCovered() Options.colored_ostream(OS, Function.LineCoverage.isFullyCovered()
? raw_ostream::GREEN ? raw_ostream::GREEN
: raw_ostream::RED) : raw_ostream::RED)
<< format("%*zd", FunctionReportColumns[5], << format("%*u", FunctionReportColumns[5],
Function.LineCoverage.NotCovered); (unsigned)Function.LineCoverage.NotCovered);
Options.colored_ostream( Options.colored_ostream(
OS, determineCoveragePercentageColor(Function.LineCoverage)) OS, determineCoveragePercentageColor(Function.LineCoverage))
<< format("%*.2f", FunctionReportColumns[6] - 1, << format("%*.2f", FunctionReportColumns[6] - 1,