From cc8646fc980b9949e9c70306b28ba412f7efb61d Mon Sep 17 00:00:00 2001
From: "Alejandro R. Mosteo" <amosteo@unizar.es>
Date: Tue, 4 Apr 2023 18:24:11 +0200
Subject: [PATCH] Tweaks to VSCode support configuration

---
 .vscode/launch.json   |  4 ++--
 .vscode/settings.json |  7 +++++--
 .vscode/tasks.json    | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8f5bb185..87585ec9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -19,10 +19,10 @@
             "cwd": "${workspaceFolder}/testsuite",
             "program": "run.py",
             "args": [
-                "default-cache" // Replace with the test you want to debug
+                "local-docker" // Replace with the test you want to debug
             ],
             "console": "integratedTerminal",
-            "justMyCode": true
+            "justMyCode": false
         }
     ]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bf6ebb9b..d913bfb3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,6 +6,9 @@
     ],
     "ada.defaultCharset": "utf-8",
     "ada.scenarioVariables": {
-        ALIRE_OS="linux",
-    }
+        "ALIRE_OS": "linux",
+    },
+    "terminal.integrated.env.linux": {
+        "ALIRE_OS": "linux",
+    },
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 99a04eed..76570ed1 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -16,7 +16,8 @@
 			"problemMatcher": [
 				"$ada"
 			],
-			"label": "Alire: Compile current file"
+			"label": "Alire: Compile current file",
+			"group": "build"
 		},
 		{
 			"type": "shell",
@@ -24,11 +25,19 @@
 			"problemMatcher": [
 				"$ada"
 			],
-			"label": "Alire: Clean all projects"
+			"label": "Alire: Clean all projects",
+			"group": "build"
 		},
 		{
 			"type": "shell",
-			"command": "/usr/bin/python3 testsuite/run.py",
+			"command": "${workspaceFolder}/testsuite/venv/bin/python3",
+			"args": [
+				"${workspaceFolder}/testsuite/run.py",
+				"-M1",
+			],
+			"options": {
+				"cwd": "${workspaceFolder}/testsuite"
+			  },
 			"problemMatcher": [],
 			"label": "Alire: Run testsuite",
 			"group": {
-- 
2.39.5