ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

Browse Source 
* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests
This commit is contained in:
Anthony Dresser
2020-01-22 13:42:37 -08:00
committed by GitHub
parent 977111eb21
commit bd7aac8ee0
895 changed files with 24651 additions and 14520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
test/coverage.js
View File

@@ -17,11 +17,12 @@ const REPO_PATH = toUpperDriveLetter(path.join(__dirname, '..'));
exports.initialize = function (loaderConfig) {
const instrumenter = iLibInstrument.createInstrumenter();
loaderConfig.nodeInstrumenter = function (contents, source) {
if (minimatch(source, '**/test/**')) { // {{SQL CARBON EDIT}} Don't instrument test helper stuff either
if (minimatch(source, '**/test/**')) {
// tests don't get instrumented
return contents;
}
// Try to find a .map file
let map = null;
let map = undefined;
try {
map = JSON.parse(fs.readFileSync(`${source}.map`).toString());
} catch (err) {
@@ -34,34 +35,35 @@ exports.initialize = function (loaderConfig) {
exports.createReport = function (isSingle) {
const mapStore = iLibSourceMaps.createSourceMapStore();
const coverageMap = iLibCoverage.createCoverageMap(global.__coverage__);
const transformed = mapStore.transformCoverage(coverageMap);
return mapStore.transformCoverage(coverageMap).then((transformed) => {
// Paths come out all broken
let newData = Object.create(null);
Object.keys(transformed.data).forEach((file) => {
const entry = transformed.data[file];
const fixedPath = fixPath(entry.path);
if (fixedPath.includes('\\vs\\') || fixedPath.includes('/vs/')) { return; } // {{SQL CARBON EDIT}} skip vscode files
entry.data.path = fixedPath;
newData[fixedPath] = entry;
});
transformed.data = newData;
// Paths come out all broken
let newData = Object.create(null);
Object.keys(transformed.map.data).forEach((file) => {
const entry = transformed.map.data[file];
const fixedPath = fixPath(entry.path);
if (fixedPath.includes('\\vs\\') || fixedPath.includes('/vs/')) { return; } // {{SQL CARBON EDIT}} skip vscode files
entry.data.path = fixedPath;
newData[fixedPath] = entry;
const context = iLibReport.createContext({
dir: path.join(__dirname, `../.build/coverage${isSingle ? '-single' : ''}`),
coverageMap: transformed
});
const tree = context.getTree('flat');
let reports = [];
if (isSingle) {
reports.push(iReports.create('lcovonly'));
} else {
reports.push(iReports.create('json'));
reports.push(iReports.create('lcov'));
reports.push(iReports.create('html'));
reports.push(iReports.create('cobertura')); // {{SQL CARBON EDIT}} add covertura
}
reports.forEach(report => tree.visit(report, context));
});
transformed.map.data = newData;
const tree = iLibReport.summarizers.flat(transformed.map);
const context = iLibReport.createContext({
dir: path.join(__dirname, `../.build/coverage${isSingle ? '-single' : ''}`)
});
let reports = [];
if (isSingle) {
reports.push(iReports.create('lcovonly'));
} else {
reports.push(iReports.create('json'));
reports.push(iReports.create('lcov'));
reports.push(iReports.create('html'));
reports.push(iReports.create('cobertura')); // {{SQL CARBON EDIT}} add covertura
}
reports.forEach(report => tree.visit(report, context));
};
function toUpperDriveLetter(str) {

2
test/electron/renderer.js
View File

@@ -67,7 +67,7 @@ function initLoader(opts) {
function createCoverageReport(opts) {
if (opts.coverage) {
coverage.createReport(opts.run || opts.runGlob);
return coverage.createReport(opts.run || opts.runGlob);
}
return Promise.resolve(undefined);
}