Merge branch 'release/2.0.4'

xDrivenDevelopment · Aug 16, 2016 · 47fd458 · 47fd458
2 parents a8de7de + f359a3d
commit 47fd458
Show file tree

Hide file tree

Showing 4 changed files with 250 additions and 201 deletions.
diff --git a/.atom-build.json b/.atom-build.json
@@ -0,0 +1,35 @@
+{
+ "cmd": "oscript",
+ "name": "Precommit1c full testing",
+ "args": [ "-encoding=utf-8", "{PROJECT_PATH}/../oscript-library/tests/testrunner.os", "-runall", "{PROJECT_PATH}/tests"],
+ "sh": false,
+ "errorMatch": [
+ "{Модуль (?<file>[^/]+) / Ошибка в строке: (?<line>[0-9]+) / (?<message>.*)"
+ ],
+ "targets": {
+ "Run current file": {
+ "cmd": "oscript",
+ "args": [ "-encoding=utf-8", "{FILE_ACTIVE}"],
+ "sh": false,
+ "errorMatch": [
+ "{Модуль (?<file>[^/]+) / Ошибка в строке: (?<line>[0-9]+) / (?<message>.*)"
+ ]
+ },
+ "Test current test-file": {
+ "cmd": "oscript",
+ "args": [ "-encoding=utf-8", "{PROJECT_PATH}/../oscript-library/tests/testrunner.os", "-run", "{FILE_ACTIVE}"],
+ "sh": false,
+ "errorMatch": [
+ "{Модуль (?<file>[^/]+) / Ошибка в строке: (?<line>[0-9]+) / (?<message>.*)"
+ ]
+ },
+ "Test select test-name": {
+ "cmd": "oscript",
+ "args": [ "-encoding=utf-8", "{PROJECT_PATH}/../oscript-library/tests/testrunner.os", "-run", "{FILE_ACTIVE}", "{SELECTION}"],
+ "sh": false,
+ "errorMatch": [
+ "{Модуль (?<file>[^/]+) / Ошибка в строке: (?<line>[0-9]+) / (?<message>.*)"
+ ]
+ }
+ }
+}