Merge remote-tracking branch 'origin/master' into ads-master-vscode-2020-05-31T19-47-47

This commit is contained in:
Anthony Dresser
2020-06-03 12:35:26 -07:00
114 changed files with 2815 additions and 2428 deletions

View File

@@ -56,6 +56,7 @@ exports.createReport = function (isSingle) {
let reports = [];
if (isSingle) {
reports.push(iReports.create('lcovonly'));
reports.push(iReports.create('json')); // {{SQL CARBON EDIT}} add json for code coverage merging
} else {
reports.push(iReports.create('json'));
reports.push(iReports.create('lcov'));