diff --git a/libraries/tools/kotlin-test-nodejs-runner/cli.ts b/libraries/tools/kotlin-test-nodejs-runner/cli.ts index c6909f3c41e..125cfb4ad81 100755 --- a/libraries/tools/kotlin-test-nodejs-runner/cli.ts +++ b/libraries/tools/kotlin-test-nodejs-runner/cli.ts @@ -1,47 +1,13 @@ import {TeamCityMessagesFlow} from "./src/TeamCityMessagesFlow"; import {directRunner, KotlinTestRunner} from "./src/KotlinTestRunner"; import {IgnoredTestSuitesReporting, runWithTeamCityReporter} from "./src/KotlinTestTeamCityReporter"; -import {CliArgsParser} from "./src/CliArgsParser"; +import {defaultCliArgsParser} from "./src/CliArgsParser"; import {configureFiltering} from "./src/CliFiltertingConfiguration"; import {hrTimer} from "./src/Timer"; const kotlin_test = require('kotlin-test'); -const parser = new CliArgsParser({ - version: VERSION, - bin: BIN, - description: DESCRIPTION, - usage: "[-t --tests] [-e --exclude] , , ..", - args: { - include: { - keys: ['--tests', '--include'], - help: "Tests to include. Example: MySuite.test1,MySuite.MySubSuite.*,*unix*,!*windows*", - default: "*" - - }, - exclude: { - keys: ['--exclude'], - help: "Tests to exclude. Example: MySuite.test1,MySuite.MySubSuite.*,*unix*" - }, - ignoredTestSuites: { - keys: ['--ignoredTestSuites'], - help: "How to deal with ignored test suites", - single: true, - values: [ - IgnoredTestSuitesReporting.skip, - IgnoredTestSuitesReporting.reportAsIgnoredTest, - IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored - ], - valuesHelp: [ - "don't report ignored test suites", - "useful to speedup large ignored test suites", - "will cause visiting all inner tests", - ], - default: IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored - } - }, - freeArgsTitle: "module_name" -}); +const parser = defaultCliArgsParser; const processArgs = process.argv.slice(2); const untypedArgs = parser.parse(processArgs); diff --git a/libraries/tools/kotlin-test-nodejs-runner/src/CliArgsParser.ts b/libraries/tools/kotlin-test-nodejs-runner/src/CliArgsParser.ts index 367cb66a15e..84315cf418c 100644 --- a/libraries/tools/kotlin-test-nodejs-runner/src/CliArgsParser.ts +++ b/libraries/tools/kotlin-test-nodejs-runner/src/CliArgsParser.ts @@ -1,4 +1,5 @@ import {println, startsWith} from "./utils"; +import {IgnoredTestSuitesReporting} from "./KotlinTestTeamCityReporter"; export type CliDescription = { version: string, @@ -113,3 +114,41 @@ export class CliArgsParser { return result } } + +export const defaultCliDescription: CliDescription = { + version: VERSION, + bin: BIN, + description: DESCRIPTION, + usage: "[-t --tests] [-e --exclude] , , ..", + args: { + include: { + keys: ['--tests', '--include'], + help: "Tests to include. Example: MySuite.test1,MySuite.MySubSuite.*,*unix*,!*windows*", + default: "*" + + }, + exclude: { + keys: ['--exclude'], + help: "Tests to exclude. Example: MySuite.test1,MySuite.MySubSuite.*,*unix*" + }, + ignoredTestSuites: { + keys: ['--ignoredTestSuites'], + help: "How to deal with ignored test suites", + single: true, + values: [ + IgnoredTestSuitesReporting.skip, + IgnoredTestSuitesReporting.reportAsIgnoredTest, + IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored + ], + valuesHelp: [ + "don't report ignored test suites", + "useful to speedup large ignored test suites", + "will cause visiting all inner tests", + ], + default: IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored + } + }, + freeArgsTitle: "module_name" +}; + +export const defaultCliArgsParser: CliArgsParser = new CliArgsParser(defaultCliDescription);