diff --git a/common/changes/@bentley/build-tools/fix-rush-test_2021-09-17-15-23.json b/common/changes/@bentley/build-tools/fix-rush-test_2021-09-17-15-23.json new file mode 100644 index 00000000000..b74480de944 --- /dev/null +++ b/common/changes/@bentley/build-tools/fix-rush-test_2021-09-17-15-23.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@bentley/build-tools", + "comment": "", + "type": "none" + } + ], + "packageName": "@bentley/build-tools" +} \ No newline at end of file diff --git a/tools/build/bin/betools.js b/tools/build/bin/betools.js index 5dac8e98da2..bed694c820c 100755 --- a/tools/build/bin/betools.js +++ b/tools/build/bin/betools.js @@ -215,5 +215,11 @@ function pseudolocalizeCommand(options) { function exec(cmd) { console.log("Running command:"); console.log(cmd.join(" ")); - return child_process.execSync(cmd.join(" "), { encoding: "utf8", stdio: 'inherit' }); + try { + return child_process.execSync(cmd.join(" "), { encoding: "utf8", stdio: 'inherit' }); + } catch (error) { + if (error.status) + process.exit(error.status); + throw error; + } } diff --git a/tools/build/scripts/rush/utils.js b/tools/build/scripts/rush/utils.js index a4dcb07d20f..4845b681ccf 100644 --- a/tools/build/scripts/rush/utils.js +++ b/tools/build/scripts/rush/utils.js @@ -4,21 +4,21 @@ *--------------------------------------------------------------------------------------------*/ function logBuildWarning(msg) { if (process.env.TF_BUILD) - console.log("##vso[task.logissue type=warning;]%s", msg); + console.error("##vso[task.logissue type=warning;]%s", msg); else console.error("WARNING: %s", msg); } function logBuildError(msg) { if (process.env.TF_BUILD) - console.log("##vso[task.logissue type=error;]%s", msg); + console.error("##vso[task.logissue type=error;]%s", msg); else console.error("ERROR: %s", msg); } function failBuild() { if (process.env.TF_BUILD) { - console.log("##vso[task.complete result=Failed;]DONE") + console.error("##vso[task.complete result=Failed;]DONE") process.exit(0); } else { process.exit(1); diff --git a/tools/build/src/mocha-reporter/index.ts b/tools/build/src/mocha-reporter/index.ts index 6ee3f68ec3f..29a2257a450 100644 --- a/tools/build/src/mocha-reporter/index.ts +++ b/tools/build/src/mocha-reporter/index.ts @@ -15,10 +15,10 @@ const Spec = require("mocha/lib/reporters/spec"); const MochaJUnitReporter = require("mocha-junit-reporter"); function withStdErr(callback: () => void) { - const originalConsoleLog = console.log; - console.log = console.error; + const originalConsoleLog = Base.consoleLog; + Base.consoleLog = console.error; callback(); - console.log = originalConsoleLog; + Base.consoleLog = originalConsoleLog; } declare const mocha: any;