Fix Swift rpath lookup

Author: award999

.vscode-test.js

@@ -31,6 +31,10 @@ const launchArgs = [
     "--disable-crash-reporter",
     "--disable-workspace-trust",
     "--disable-telemetry",
+    "--disable-extension",
+    "vscode.github",
+    "--disable-extension",
+    "vscode.github-authentication",
 ];
 if (dataDir) {
     launchArgs.push("--user-data-dir", dataDir);

docker/sandbox.sb

@@ -3,7 +3,7 @@
 (deny default)
 
 ; Get fonts
-(import "system.sb")
+; (import "system.sb")
 
 ; Helpers
 (define (param-regex param-name param-relative-regex)
@@ -50,18 +50,33 @@
     (regex #"^/private/var/folders/[^/]+/[^/]+/.+")
     (regex #"^/Library/Preferences/.*.plist")
     (regex #"^/[^/]+/Library/Python")
+    (subpath "/Library/Developer/CommandLineTools")
     (subpath "/Library/Developer/Toolchains")
     (subpath "/Library/Frameworks/UIAutomation.framework")
     (subpath "/Library/Python")
+    (subpath "/System/Library/Perl")
     (subpath "/Applications/Xcode.app")
     (subpath "/Applications/Xcode-beta.app")
     (subpath "/bin")
     (subpath "/usr/bin")
     (subpath "/usr/local/bin")
-    (subpath "/usr/lib/swift")
     (subpath "/usr/libexec/path_helper")
     (subpath "/usr/local/share/git-core")
     (subpath "/usr/local/share/hwtrace")
+
+    (regex #".*/LLDB.framework/.*")
+    (regex #".*/Python3.framework/.*")
+    (regex #".*/branch-main/.*")
+    (regex #".*/usr/lib/swift/.*")
+    ; (regex #".*/Frameworks/.*")
+    ; (regex #".*/PrivateFrameworks/.*")
+
+    ; (subpath "/System/Volumes/Preboot")
+    ; (subpath "/System/Volumes")
+    ; (subpath "/usr/lib")
+    ; (subpath "/Users/ec2-user")
+    ; (subpath "/Library/Developer/CommandLineTool")
+    ; (subpath "/")
 )
 
 (allow mach-lookup)
@@ -84,8 +99,11 @@
     (regex #"^/Users/[^/]+/Library/Caches/com.apple.python.*")
     (regex #"^/Users/[^/]+/Library/Developer/Xcode/DerivedData.*")
     (regex #"^/Users/[^/]+/Library/Application Support/Code.*")
+    (regex #"^/Users/[^/]+/Library/Application Support/Microsoft.*")
     (regex #"^/private/var/folders/[^/]+/[^/]+/.+")
     (regex #"^/Users/[^/]+/.vscode.*")
+
+    (regex #".*/branch-main.*")
 )
 
 ; Execute

docker/test-macos.sh

@@ -56,7 +56,13 @@ PATH="$ARTIFACTS/$NODE_NAME/bin:$PATH"
 mkdir -p "$(dirname "$VSCODE_SETTINGS")"
 cat <<EOT > "$VSCODE_SETTINGS"
 {
-    "swift.disableSandbox": true
+    "swift.path": "/Users/ec2-user/jenkins/workspace/pr-vscode-swift-macos/branch-main/latest_toolchain/usr/bin"
+    "swift.disableSandbox": true,
+    "swift.debugger.disable": true,
+    "swift.debugger.path": "/Users/ec2-user/jenkins/workspace/pr-vscode-swift-macos/branch-main/latest_toolchain/usr/bin/lldb-dap",
+    "lldb.library": "/Applications/Xcode-beta.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/LLDB",
+    "lldb.launch.expressions": "native",
+    "lldb.suppressUpdateNotifications": true
 }
 EOT
 
@@ -84,4 +90,6 @@ export GIT_CONFIG_VALUE_0="$PWD/hooks"
 
 # Need to set proxy to download VS Code
 export npm_config_https_proxy="$HTTPS_PROXY"
+
+# export DEVELOPER_DIR=/Applications/Xcode-beta.app
 VSCODE_DATA_DIR="$USER_DATA" CI=1 FAST_TEST_RUN=1 npm run coverage -- --coverage-output "$PWD/coverage"

src/SwiftPackage.ts

@@ -211,13 +211,9 @@ export class SwiftPackage implements PackageContents {
         toolchain: SwiftToolchain
     ): Promise<SwiftPackageState> {
         try {
-            let { stdout } = await execSwift(
-                toolchain.buildFlags.withAdditionalFlags(["package", "describe", "--type", "json"]),
-                toolchain,
-                {
-                    cwd: folder.fsPath,
-                }
-            );
+            let { stdout } = await execSwift(["package", "describe", "--type", "json"], toolchain, {
+                cwd: folder.fsPath,
+            });
             // remove lines from `swift package describe` until we find a "{"
             while (!stdout.startsWith("{")) {
                 const firstNewLine = stdout.indexOf("\n");

src/configuration.ts

@@ -51,6 +51,8 @@ export interface DebuggerConfiguration {
     readonly useDebugAdapterFromToolchain: boolean;
     /** Return path to debug adapter */
     readonly customDebugAdapterPath: string;
+    /** Whether or not to disable setting up the debugger */
+    readonly disable: boolean;
 }
 
 /** workspace folder configuration */
@@ -199,6 +201,11 @@ const configuration = {
             get customDebugAdapterPath(): string {
                 return vscode.workspace.getConfiguration("swift.debugger").get<string>("path", "");
             },
+            get disable(): boolean {
+                return vscode.workspace
+                    .getConfiguration("swift.debugger")
+                    .get<boolean>("disable", false);
+            },
         };
     },
     /** Files and directories to exclude from the code coverage. */

src/extension.ts

@@ -38,7 +38,7 @@ import { showReloadExtensionNotification } from "./ui/ReloadExtension";
 import { checkAndWarnAboutWindowsSymlinks } from "./ui/win32";
 import { SwiftEnvironmentVariablesManager, SwiftTerminalProfileProvider } from "./terminal";
 import { resolveFolderDependencies } from "./commands/dependencies/resolve";
-import { SelectedXcodeWatcher } from "./toolchain/SelectedXcodeWatcher";
+// import { SelectedXcodeWatcher } from "./toolchain/SelectedXcodeWatcher";
 
 /**
  * External API as exposed by the extension. Can be queried by other extensions
@@ -128,8 +128,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
         const workspaceContext = await WorkspaceContext.create(context, outputChannel, toolchain);
         context.subscriptions.push(...commands.register(workspaceContext));
         context.subscriptions.push(workspaceContext);
-        context.subscriptions.push(registerDebugger(workspaceContext));
-        context.subscriptions.push(new SelectedXcodeWatcher(outputChannel));
+        if (!configuration.debugger.disable) {
+            context.subscriptions.push(registerDebugger(workspaceContext));
+        }
+        // context.subscriptions.push(new SelectedXcodeWatcher(outputChannel));
 
         // listen for workspace folder changes and active text editor changes
         workspaceContext.setupEventListeners();

src/toolchain/toolchain.ts

@@ -813,10 +813,7 @@ export class SwiftToolchain {
     private static async getSwiftTargetInfo(): Promise<SwiftTargetInfo> {
         try {
             try {
-                const { stdout } = await execSwift(
-                    ["-print-target-info", ...BuildFlags.disableSandboxFlags()],
-                    "default"
-                );
+                const { stdout } = await execSwift(["-print-target-info"], "default");
                 const targetInfo = JSON.parse(stdout.trimEnd()) as SwiftTargetInfo;
                 if (targetInfo.compilerVersion) {
                     return targetInfo;

src/utilities/utilities.ts

@@ -109,14 +109,18 @@ export async function execFile(
             options.env = { ...(options.env ?? process.env), ...runtimeEnv };
         }
     }
-    return new Promise<{ stdout: string; stderr: string }>((resolve, reject) =>
-        cp.execFile(executable, args, options, (error, stdout, stderr) => {
-            if (error) {
-                reject(new ExecFileError(error, stdout, stderr));
-            }
-            resolve({ stdout, stderr });
-        })
-    );
+    return new Promise<{ stdout: string; stderr: string }>((resolve, reject) => {
+        try {
+            cp.execFile(executable, args, options, (error, stdout, stderr) => {
+                if (error) {
+                    reject(new ExecFileError(error, stdout, stderr));
+                }
+                resolve({ stdout, stderr });
+            });
+        } catch (e) {
+            reject(e);
+        }
+    });
 }
 
 export async function execFileStreamOutput(

test/integration-tests/SwiftSnippet.test.ts

@@ -62,6 +62,7 @@ suite("SwiftSnippet Test Suite @slow", function () {
             // Set a breakpoint
             vscode.debug.addBreakpoints(breakpoints);
         },
+        requiresDebugger: true,
     });
 
     suiteTeardown(async () => {

test/integration-tests/commands/build.test.ts

@@ -56,6 +56,7 @@ suite("Build Commands @slow", function () {
         async teardown() {
             await vscode.commands.executeCommand(Workbench.ACTION_CLOSEALLEDITORS);
         },
+        requiresDebugger: true,
     });
 
     test("Swift: Run Build", async () => {

test/integration-tests/debugger/lldb.test.ts

@@ -34,6 +34,7 @@ suite("lldb contract test suite", () => {
             }
             workspaceContext = ctx;
         },
+        requiresDebugger: true,
     });
 
     test("getLldbProcess Contract Test, make sure the command returns", async () => {

test/integration-tests/extension.test.ts

@@ -19,7 +19,8 @@ import { SwiftExecution } from "../../src/tasks/SwiftExecution";
 import { activateExtensionForTest } from "./utilities/testutilities";
 import { expect } from "chai";
 
-suite("Extension Test Suite", () => {
+suite("Extension Test Suite", function () {
+    this.timeout(60000);
     let workspaceContext: WorkspaceContext;
 
     activateExtensionForTest({
@@ -42,7 +43,8 @@ suite("Extension Test Suite", () => {
         }).timeout(5000);*/
     });
 
-    suite("Workspace", () => {
+    suite("Workspace", function () {
+        this.timeout(60000);
         /** Verify tasks.json is being loaded */
         test("Tasks.json", async () => {
             const folder = workspaceContext.folders.find(f => f.name === "test/defaultPackage");
@@ -54,6 +56,6 @@ suite("Extension Test Suite", () => {
             for (const arg of ["build", "--build-tests", "--verbose"]) {
                 assert(execution?.args.find(item => item === arg));
             }
-        });
+        }).timeout(60000);
     });
-}).timeout(15000);
+});

test/integration-tests/testexplorer/TestExplorerIntegration.test.ts

@@ -72,6 +72,7 @@ suite("Test Explorer Suite", function () {
             await waitForTestExplorerReady(testExplorer);
         },
         requiresLSP: true,
+        requiresDebugger: true,
     });
 
     suite("Debugging", function () {

test/integration-tests/utilities/testutilities.ts

@@ -23,6 +23,7 @@ import { waitForNoRunningTasks } from "../../utilities/tasks";
 import { closeAllEditors } from "../../utilities/commands";
 import { isDeepStrictEqual } from "util";
 import { Version } from "../../../src/utilities/version";
+import configuration from "../../../src/configuration";
 
 function getRootWorkspaceFolder(): vscode.WorkspaceFolder {
     const result = vscode.workspace.workspaceFolders?.at(0);
@@ -67,7 +68,8 @@ const extensionBootstrapper = (() => {
         after: Mocha.HookFunction,
         teardown: ((this: Mocha.Context) => Promise<void>) | undefined,
         testAssets?: string[],
-        requiresLSP: boolean = false
+        requiresLSP: boolean = false,
+        requiresDebugger: boolean = false
     ) {
         let workspaceContext: WorkspaceContext | undefined;
         let autoTeardown: void | (() => Promise<void>);
@@ -87,6 +89,9 @@ const extensionBootstrapper = (() => {
             ) {
                 this.skip();
             }
+            if (requiresDebugger && configuration.debugger.disable) {
+                this.skip();
+            }
             if (!setup) {
                 return;
             }
@@ -204,14 +209,16 @@ const extensionBootstrapper = (() => {
             teardown?: (this: Mocha.Context) => Promise<void>;
             testAssets?: string[];
             requiresLSP?: boolean;
+            requiresDebugger?: boolean;
         }) {
             testRunnerSetup(
                 mocha.before,
                 config?.setup,
                 mocha.after,
                 config?.teardown,
                 config?.testAssets,
-                config?.requiresLSP
+                config?.requiresLSP,
+                config?.requiresDebugger
             );
         },
 
@@ -222,13 +229,17 @@ const extensionBootstrapper = (() => {
             ) => Promise<(() => Promise<void>) | void>;
             teardown?: (this: Mocha.Context) => Promise<void>;
             testAssets?: string[];
+            requiresLSP?: boolean;
+            requiresDebugger?: boolean;
         }) {
             testRunnerSetup(
                 mocha.beforeEach,
                 config?.setup,
                 mocha.afterEach,
                 config?.teardown,
-                config?.testAssets
+                config?.testAssets,
+                config?.requiresLSP,
+                config?.requiresDebugger
             );
         },
     };