diff --git a/src/platform/packages/shared/kbn-scout/src/servers/run_kibana_server.ts b/src/platform/packages/shared/kbn-scout/src/servers/run_kibana_server.ts index dfcf25515e9df..7c2c96afe29ee 100644 --- a/src/platform/packages/shared/kbn-scout/src/servers/run_kibana_server.ts +++ b/src/platform/packages/shared/kbn-scout/src/servers/run_kibana_server.ts @@ -28,6 +28,15 @@ export async function runKibanaServer(options: { const installDir = runOptions.alwaysUseSource ? undefined : options.installDir; const devMode = !installDir; const useTaskRunner = options.config.get('kbnTestServer.useDedicatedTaskRunner'); + const env = { + ...process.env, + ...options.config.get('kbnTestServer.env'), + }; + if (env.NO_COLOR !== undefined) { + delete env.FORCE_COLOR; + } else if (env.FORCE_COLOR === undefined) { + env.FORCE_COLOR = '1'; + } const procRunnerOpts = { cwd: installDir || REPO_ROOT, @@ -36,11 +45,7 @@ export async function runKibanaServer(options: { ? Path.resolve(installDir, 'bin/kibana.bat') : Path.resolve(installDir, 'bin/kibana') : process.execPath, - env: { - FORCE_COLOR: 1, - ...process.env, - ...options.config.get('kbnTestServer.env'), - }, + env, wait: runOptions.wait, onEarlyExit: options.onEarlyExit, }; diff --git a/src/platform/packages/shared/kbn-test/src/functional_tests/lib/run_kibana_server.ts b/src/platform/packages/shared/kbn-test/src/functional_tests/lib/run_kibana_server.ts index f3eb080fb4518..de5e0a34a348b 100644 --- a/src/platform/packages/shared/kbn-test/src/functional_tests/lib/run_kibana_server.ts +++ b/src/platform/packages/shared/kbn-test/src/functional_tests/lib/run_kibana_server.ts @@ -33,6 +33,15 @@ export async function runKibanaServer(options: { const installDir = runOptions.alwaysUseSource ? undefined : options.installDir; const devMode = !installDir; const useTaskRunner = options.config.get('kbnTestServer.useDedicatedTaskRunner'); + const env = { + ...process.env, + ...options.config.get('kbnTestServer.env'), + }; + if (env.NO_COLOR !== undefined) { + delete env.FORCE_COLOR; + } else if (env.FORCE_COLOR === undefined) { + env.FORCE_COLOR = '1'; + } const procRunnerOpts = { cwd: installDir || REPO_ROOT, @@ -41,11 +50,7 @@ export async function runKibanaServer(options: { ? Path.resolve(installDir, 'bin/kibana.bat') : Path.resolve(installDir, 'bin/kibana') : process.execPath, - env: { - FORCE_COLOR: 1, - ...process.env, - ...options.config.get('kbnTestServer.env'), - }, + env, wait: runOptions.wait, onEarlyExit: options.onEarlyExit, };