Debug LLDB test

swiftlang · Nov 22, 2024 · a328da3 · a328da3
1 parent 3753c12
commit a328da3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/debugger/lldb.ts b/src/debugger/lldb.ts
@@ -133,24 +133,30 @@ export async function getLldbProcess(
     ctx: WorkspaceContext
 ): Promise<Array<{ pid: number; label: string }> | undefined> {
     try {
+        console.log(">>> Get LLDB 1");
         // use LLDB to get list of processes
         const lldb = await ctx.toolchain.getLLDB();
+        console.log(">>> Get LLDB 2", lldb);
         const { stdout } = await execFile(lldb, [
             "--batch",
             "--no-lldbinit",
             "--one-line",
             "platform process list --show-args --all-users",
         ]);
+        console.log(">>> Get LLDB 3", stdout);
         const entries = stdout.split("\n");
-        return entries.flatMap(line => {
+        const processes = entries.flatMap(line => {
             const match = /^(\d+)\s+\d+\s+\S+\s+\S+\s+(.+)$/.exec(line);
             if (match) {
                 return [{ pid: parseInt(match[1]), label: `${match[1]}: ${match[2]}` }];
             } else {
                 return [];
             }
         });
+        console.log(">>> Get LLDB 4", processes);
+        return processes;
     } catch (error) {
+        console.log(">>> Get LLDB error", error);
         const errorMessage = `Failed to run LLDB: ${getErrorDescription(error)}`;
         ctx.outputChannel.log(errorMessage);
         vscode.window.showErrorMessage(errorMessage);

diff --git a/src/ui/SwiftOutputChannel.ts b/src/ui/SwiftOutputChannel.ts
@@ -86,15 +86,10 @@ export class SwiftOutputChannel implements vscode.OutputChannel {
     }
 
     logDiagnostic(message: string, label?: string) {
-        if (!configuration.diagnostics) {
+        if (!configuration.diagnostics && process.env["CI"] !== "1") {
             return;
         }
-        let fullMessage: string;
-        if (label !== undefined) {
-            fullMessage = `${label}: ${message}`;
-        } else {
-            fullMessage = message;
-        }
+        const fullMessage = label !== undefined ? `${label}: ${message}` : message;
         this.appendLine(`${this.nowFormatted}: ${fullMessage}`);
     }
 

diff --git a/test/integration-tests/debugger/lldb.test.ts b/test/integration-tests/debugger/lldb.test.ts
@@ -17,7 +17,7 @@ import { getLLDBLibPath, getLldbProcess } from "../../../src/debugger/lldb";
 import { WorkspaceContext } from "../../../src/WorkspaceContext";
 import { activateExtensionForSuite } from "../utilities/testutilities";
 
-suite("lldb contract test suite", () => {
+suite.only("lldb contract test suite", () => {
     let workspaceContext: WorkspaceContext;
 
     activateExtensionForSuite({
@@ -27,6 +27,7 @@ suite("lldb contract test suite", () => {
     });
 
     test("getLldbProcess Contract Test, make sure the command returns", async () => {
+        console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> start 30");
         const result = await getLldbProcess(workspaceContext);
 
         // Assumption: machine will always return some process
@@ -40,6 +41,7 @@ suite("lldb contract test suite", () => {
     });
 
     test("getLLDBLibPath Contract Test, make sure we can find lib LLDB", async () => {
+        console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> start 44");
         const libPath = await getLLDBLibPath(workspaceContext.toolchain);
 
         // Check the result for various platforms