Only run these test on 6.0+ toolchain

CodeLLDB is not working with older toolchains so need to use lldb-dap
swiftlang · Oct 9, 2024 · 34ed2dd · 34ed2dd
1 parent 639ab3a
commit 34ed2dd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/src/SwiftSnippets.ts b/src/SwiftSnippets.ts
@@ -87,24 +87,21 @@ export async function debugSnippetWithOptions(
         ctx.toolchain
     );
 
-    try {
-        // queue build task and when it is complete run executable in the debugger
-        await folderContext.taskQueue
-            .queueOperation(new TaskOperation(snippetBuildTask))
-            .then(result => {
-                if (result === 0) {
-                    const snippetDebugConfig = createSnippetConfiguration(
-                        snippetName,
-                        folderContext
-                    );
-                    return debugLaunchConfig(
-                        folderContext.workspaceFolder,
-                        snippetDebugConfig,
-                        options
-                    );
-                }
-            });
-    } catch {
-        // ignore error if task failed to run
-    }
+    // try {
+    // queue build task and when it is complete run executable in the debugger
+    await folderContext.taskQueue
+        .queueOperation(new TaskOperation(snippetBuildTask))
+        .then(result => {
+            if (result === 0) {
+                const snippetDebugConfig = createSnippetConfiguration(snippetName, folderContext);
+                return debugLaunchConfig(
+                    folderContext.workspaceFolder,
+                    snippetDebugConfig,
+                    options
+                );
+            }
+        });
+    // } catch {
+    //     // ignore error if task failed to run
+    // }
 }
diff --git a/test/integration-tests/SwiftSnippet.test.ts b/test/integration-tests/SwiftSnippet.test.ts
@@ -23,15 +23,19 @@ import {
     waitForDebugAdapterExit,
     waitUntilDebugSessionTerminates,
 } from "../utilities/debug";
+import { Version } from "../../src/utilities/version";
 
 suite("SwiftSnippet Test Suite", () => {
     const uri = testAssetUri("defaultPackage/Snippets/hello.swift");
     const breakpoints = [
         new vscode.SourceBreakpoint(new vscode.Location(uri, new vscode.Position(2, 0))),
     ];
 
-    suiteSetup(async () => {
-        await folderContextPromise("defaultPackage");
+    suiteSetup(async function () {
+        const folder = await folderContextPromise("defaultPackage");
+        if (folder.workspaceContext.toolchain.swiftVersion.isLessThan(new Version(6, 0, 0))) {
+            this.skip();
+        }
         await waitForNoRunningTasks();
 
         // File needs to be open for command to be enabled