зеркало из https://github.com/electron/electron.git
build: fix invocation of cpplint on Windows (#26011)
This commit is contained in:
Родитель
16caa54248
Коммит
64504536fa
|
@ -23,6 +23,8 @@ const IGNORELIST = new Set([
|
|||
['spec', 'ts-smoke', 'runner.js']
|
||||
].map(tokens => path.join(SOURCE_ROOT, ...tokens)));
|
||||
|
||||
const IS_WINDOWS = process.platform === 'win32';
|
||||
|
||||
function spawnAndCheckExitCode (cmd, args, opts) {
|
||||
opts = Object.assign({ stdio: 'inherit' }, opts);
|
||||
const status = childProcess.spawnSync(cmd, args, opts).status;
|
||||
|
@ -30,7 +32,7 @@ function spawnAndCheckExitCode (cmd, args, opts) {
|
|||
}
|
||||
|
||||
function cpplint (args) {
|
||||
const result = childProcess.spawnSync('cpplint.py', args, { encoding: 'utf8' });
|
||||
const result = childProcess.spawnSync(IS_WINDOWS ? 'cpplint.bat' : 'cpplint.py', args, { encoding: 'utf8', shell: true });
|
||||
// cpplint.py writes EVERYTHING to stderr, including status messages
|
||||
if (result.stderr) {
|
||||
for (const line of result.stderr.split(/[\r\n]+/)) {
|
||||
|
@ -39,8 +41,9 @@ function cpplint (args) {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (result.status) {
|
||||
process.exit(result.status);
|
||||
if (result.status !== 0) {
|
||||
if (result.error) console.error(result.error);
|
||||
process.exit(result.status || 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче