azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Igore if kotlin_test not found

Browse Source
This commit is contained in:
Ilya Goncharov
2021-10-14 20:18:45 +03:00
committed by TeamCityServer
parent 86c6ca7f5f
commit 4cca78f8d8
2 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-test-js-runner/karma.ts
+21 -15
View File
@@ -6,21 +6,27 @@
import {CliArgsParser, getDefaultCliDescription} from "./src/CliArgsParser"; import {CliArgsParser, getDefaultCliDescription} from "./src/CliArgsParser";
import {runWithFilteringAndConsoleAdapters} from "./src/Adapter"; import {runWithFilteringAndConsoleAdapters} from "./src/Adapter";
const kotlin_test = require('kotlin-test'); let kotlin_test
try {
kotlin_test = require('kotlin-test');
} catch {
}
const parser = new CliArgsParser( if (kotlin_test) {
getDefaultCliDescription(), const parser = new CliArgsParser(
(exitCode) => { getDefaultCliDescription(),
throw new Error(`Exit with ${exitCode}`) (exitCode) => {
} throw new Error(`Exit with ${exitCode}`)
); }
const untypedArgs = parser.parse(window.__karma__.config.args); );
const untypedArgs = parser.parse(window.__karma__.config.args);
const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$(); const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$();
kotlin_test.setAdapter(runWithFilteringAndConsoleAdapters(initialAdapter, untypedArgs)); kotlin_test.setAdapter(runWithFilteringAndConsoleAdapters(initialAdapter, untypedArgs));
const resultFun = window.__karma__.result; const resultFun = window.__karma__.result;
window.__karma__.result = function (result) { window.__karma__.result = function (result) {
console.log(`--END_KOTLIN_TEST--\n${JSON.stringify(result)}`); console.log(`--END_KOTLIN_TEST--\n${JSON.stringify(result)}`);
resultFun(result) resultFun(result)
}; };
}
libraries/tools/kotlin-test-js-runner/nodejs.ts
+14 -8
View File
@@ -1,13 +1,19 @@
import {CliArgsParser, getDefaultCliDescription} from "./src/CliArgsParser"; import {CliArgsParser, getDefaultCliDescription} from "./src/CliArgsParser";
import {runWithFilteringAndConsoleAdapters} from "./src/Adapter"; import {runWithFilteringAndConsoleAdapters} from "./src/Adapter";
const kotlin_test = require('kotlin-test'); let kotlin_test
try {
kotlin_test = require('kotlin-test');
} catch {
}
const parser = new CliArgsParser( if (kotlin_test) {
getDefaultCliDescription(), const parser = new CliArgsParser(
process.exit getDefaultCliDescription(),
); process.exit
const untypedArgs = parser.parse(process.argv); );
const untypedArgs = parser.parse(process.argv);
const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$(); const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$();
kotlin_test.setAdapter(runWithFilteringAndConsoleAdapters(initialAdapter, untypedArgs)); kotlin_test.setAdapter(runWithFilteringAndConsoleAdapters(initialAdapter, untypedArgs));
}