Выделены отдельные команды тестирования через "`1testrunner" и "opm test" #73

Author: artbear

.vscode/tasks.json

@@ -1,3 +1,11 @@
+// Available variables which can be used inside of strings.
+// ${workspaceRoot}: the root folder of the team
+// ${file}: the current opened file
+// ${fileBasename}: the current opened file's basename
+// ${fileDirname}: the current opened file's dirname
+// ${fileExtname}: the current opened file's extension
+// ${cwd}: the current working directory of the spawned process
+
 {
     "version": "2.0.0",
     "_runner": "terminal",
@@ -10,11 +18,11 @@
         "args": ["-c"]
     },
     "isShellCommand": true,
-    "showOutput": "silent",
+    // "showOutput": "silent",
     "_runner": "terminal",
     "tasks": [
         {
-            "taskName": "Testing project",
+            "taskName": "Testing project (1testrunner)",
             "args": [
                  "1testrunner",
                 "-runall",
@@ -36,17 +44,17 @@
             }
         },
         {
-            "taskName": "Testing current test-file",
+            "taskName": "Testing project (opm test)",
             "args": [
-                 "1testrunner",
-                "-run",
-                "${file}"
+                 "oscript",
+                 "src/opm.os",
+                "test"
             ],
             "echoCommand": true,
             "showOutput": "always",
             "suppressTaskName": true,
-            "isBuildCommand": false,
-            "isTestCommand": true,
+            // "isBuildCommand": false,
+            "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
                 "pattern": {
@@ -58,22 +66,33 @@
             }
         },
         {
-            "taskName": "Opm: package build",
+            "taskName": "Testing current test-file",
             "args": [
-                 "opm",
-                "build",
-                "${workspaceRoot}"
+                 "1testrunner",
+                "-run",
+                "${file}"
             ],
             "echoCommand": true,
             "showOutput": "always",
             "suppressTaskName": true,
-            "isBuildCommand": false
+            "isBuildCommand": false,
+            "isTestCommand": true,
+            "problemMatcher": {
+                "fileLocation": "absolute",
+                "pattern": {
+                    "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
+                    "file": 1,
+                    "location": 2,
+                    "message": 3
+                }
+            }
         },
         {
             "taskName": "Exec all features",
             "args": [
                  "1bdd",
                 "${workspaceRoot}/features",
+                "-fail-fast", 
                 "-out", 
                 "${workspaceRoot}/exec.log"
             ],
@@ -145,20 +164,18 @@
             }
         },
         {
-            "taskName": "Exec feature + debug",
+            "taskName": "Generate feature steps",
             "args": [
                  "1bdd",
+                "gen",
                 "${file}",
-                "-fail-fast", 
-                "-verbose", 
-                "on", 
                 "-out", 
                 "${workspaceRoot}/exec.log"
             ],
             "echoCommand": true,
             "showOutput": "always",
             "suppressTaskName": true,
-            // "isBuildCommand": false,
+            "isBuildCommand": false,
             "isTestCommand": false,
             "problemMatcher": {
                 "fileLocation": "absolute",
@@ -171,28 +188,16 @@
             }
         },
         {
-            "taskName": "Generate feature steps",
+            "taskName": "Opm: package build",
             "args": [
-                 "1bdd",
-                "gen",
-                "${file}",
-                "-out", 
-                "${workspaceRoot}/exec.log"
+                "opm",
+                "build",
+                "${workspaceRoot}"
             ],
             "echoCommand": true,
             "showOutput": "always",
             "suppressTaskName": true,
-            "isBuildCommand": false,
-            "isTestCommand": false,
-            "problemMatcher": {
-                "fileLocation": "absolute",
-                "pattern": {
-                    "regexp": "{Модуль\\s+(.+)\\s\\/\\s.*:\\s+(\\d+)\\s+\\/\\s+([^{]*)",
-                    "file": 1,
-                    "location": 2,
-                    "message": 3
-                }
-            }
+            "isBuildCommand": false
         },
         {
             "taskName": "OneScript: compile",