test

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

build/scripts/entrypoint-volume.sh

@@ -134,5 +134,8 @@ echo "[INFO] Node.js dir for running VS Code: $VSCODE_NODEJS_RUNTIME_DIR"
 # Test-only repro switch for shellEnv code path (remove after validation).
 export CHECODE_TEST_STRIP_LD_LIBRARY_PATH_BEFORE_SPAWN=1
 
+# Temporary debug switch for shell environment resolution logs in Output view.
+export CHECODE_DEBUG_SHELL_ENV=1
+
 # Run launcher
 "$VSCODE_NODEJS_RUNTIME_DIR/node" ./launcher/entrypoint.js

code/src/vs/platform/shell/node/shellEnv.ts

@@ -100,6 +100,7 @@ export async function getResolvedShellEnv(configurationService: IConfigurationSe
 }
 
 async function doResolveUnixShellEnv(logService: ILogService, token: CancellationToken): Promise<typeof process.env> {
+	const shouldDebugShellEnv = process.env['CHECODE_DEBUG_SHELL_ENV'] === '1' || process.env['CHECODE_DEBUG_SHELL_ENV'] === 'true';
 	const runAsNode = process.env['ELECTRON_RUN_AS_NODE'];
 	logService.trace('getUnixShellEnvironment#runAsNode', runAsNode);
 
@@ -156,6 +157,16 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
 		}
 
 		logService.trace('getUnixShellEnvironment#spawn', JSON.stringify(shellArgs), command);
+		if (shouldDebugShellEnv) {
+			logService.info('getUnixShellEnvironment#spawnDebug', {
+				shell: systemShellUnix,
+				shellArgs,
+				command,
+				LD_LIBRARY_PATH: env['LD_LIBRARY_PATH'],
+				SHELL: env['SHELL'],
+				HOME: env['HOME']
+			});
+		}
 
 		const child = spawn(systemShellUnix, [...shellArgs, command], {
 			detached: true,
@@ -187,9 +198,25 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
 			const stderrStr = Buffer.concat(stderr).toString('utf8');
 			if (stderrStr.trim()) {
 				logService.trace('getUnixShellEnvironment#stderr', stderrStr);
+				if (shouldDebugShellEnv) {
+					logService.error('getUnixShellEnvironment#stderrDebug', stderrStr);
+				}
 			}
 
 			if (code || signal) {
+				if (shouldDebugShellEnv) {
+					logService.error('getUnixShellEnvironment#spawnFailureDebug', {
+						code,
+						signal,
+						shell: systemShellUnix,
+						shellArgs,
+						command,
+						LD_LIBRARY_PATH: env['LD_LIBRARY_PATH'],
+						SHELL: env['SHELL'],
+						HOME: env['HOME'],
+						stderr: stderrStr
+					});
+				}
 				return reject(new Error(localize('resolveShellEnvExitError', "Unexpected exit code from spawned shell (code {0}, signal {1})", code, signal)));
 			}